[Aptitude-svn-commit] r3756 - in branches/aptitude-0.3/aptitude: . src/vscreen

Daniel Burrows dburrows at costa.debian.org
Mon Aug 8 21:45:06 UTC 2005


Author: dburrows
Date: Mon Aug  8 21:45:02 2005
New Revision: 3756

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_radiogroup.cc
Log:
Don't blow up when removing the last button in a radio group.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug  8 21:45:02 2005
@@ -1,5 +1,9 @@
 2005-08-08  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_radiogroup.cc:
+
+	  Handle the case of removing the last button in a radio group.
+
 	* src/vscreen/testvscreen.cc:
 
 	  Close a memory leak reported by valgrind.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_radiogroup.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_radiogroup.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_radiogroup.cc	Mon Aug  8 21:45:02 2005
@@ -64,7 +64,14 @@
 	items[i].destroyed_conn.disconnect();
 	items[i].pressed_conn.disconnect();
 	if(selected==i)
-	  button_pressed(i-1);
+	  {
+	    if(i>0)
+	      button_pressed(i-1);
+	    else if(i+1<items.size())
+	      button_pressed(i+1);
+	    else
+	      assert(items.size() == 0);
+	  }
 
 	if(i==items.size()-1)
 	  items.pop_back();



More information about the Aptitude-svn-commit mailing list