[Aptitude-svn-commit] r4143 - branches/aptitude-0.3/aptitude/src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 21 00:58:29 2005
New Revision: 4143

Modified:
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
Log:
Actually commit the is_destroyed change.

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	Wed Sep 21 00:58:29 2005
@@ -128,8 +128,6 @@
   // Make sure we don't die during the destroy routine.
   vs_widget_ref this_ref = this;
 
-  is_destroyed = true;
-
   hide();
 
   if(owner)
@@ -138,6 +136,15 @@
       assert(!win);
     }
 
+  // This must be done after hide() and rem_widget(), because
+  // otherwise some of the vscreen_widget manipulators become NOPs,
+  // which causes confusion and problems for code that accesses them.
+  // For instance, the multiplex rem_widget code expects hide_widget
+  // to do something sensible.  I could try to fix this, but it's much
+  // more straightforward to just leave the widget in a non-destroyed
+  // state until after it's disconnected from everything.
+  is_destroyed = true;
+
   destroyed();
 }