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

[Daniel Burrows]

Author: dburrows
Date: Mon Aug  8 23:02:26 2005
New Revision: 3763

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
Log:
Abort if a widget is destroyed twice.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug  8 23:02:26 2005
@@ -1,5 +1,10 @@
 2005-08-08  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vscreen_widget.cc:
+
+	  Go past silently doing nothing if a widget is destroyed twice;
+	  actually abort the program if this occurs.
+
 	* src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf.cc, src/vscree/vs_stacked.cc, src/vscreen/vs_table.cc:
 
 	  Make sure that we explicitly zero out the "owner" field of

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	Mon Aug  8 23:02:26 2005
@@ -123,13 +123,11 @@
 void vscreen_widget::destroy()
 {
   assert(refcount > 0);
+  assert(!is_destroyed);
 
   // Make sure we don't die during the destroy routine.
   vs_widget_ref this_ref = this;
 
-  if(is_destroyed)
-    return;
-
   is_destroyed = true;
 
   hide();