Sometimes when base widget of QtxWorkstackChild is removed it nullifies myWidget...

Now protection is provided. If QtxWorkstackChild receives event about deletion of its base widget it removes it clears its layout. Also all processEvents() emthods call are commented in DiagramGUI_Module.

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index 566b2953f112549f5422dbcdf4629238f00c242d..5ad12139ce17a753ace46f9323d3f7c5736654b5 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -1236,7 +1236,15 @@ void QtxWorkstackChild::onDestroyed( QObject* obj )
 {
   if ( obj != widget() )
     return;
-
+  
+  QLayout* lay = layout();
+  if ( lay )
+  {
+    QLayoutItem* item =        lay->takeAt( 0 );
+    if ( item )
+      lay->removeItem( item );
+  }
+  
   myWidget = 0;
   deleteLater();
 }
@@ -1249,6 +1257,14 @@ void QtxWorkstackChild::childEvent( QChildEvent* e )
 {
   if ( e->removed() && e->child() == widget() )
   {
+    QLayout* lay = layout();
+    if ( lay )
+    {
+      QLayoutItem* item =      lay->takeAt( 0 );
+      if ( item )
+        lay->removeItem( item );
+    }
+
     myWidget = 0;
     deleteLater();
   }