This is merge from V5_1_4_BR(2010-04-21) in order to avoid ATLAS exception, which...

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index a12ef20d1a18fdc431449af98069a16c250773a1..171733a349768880c5d7a1820add874113e687b9 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -514,11 +514,11 @@ void QtxWorkstackArea::removeWidget( QWidget* wid, const bool del )
   if ( !myList.contains( wid ) )
     return;
 
+  myStack->removeWidget( child( wid ) );
+
   if ( myBar->indexOf( widgetId( wid ) ) != -1 )
     myBar->removeTab( myBar->indexOf( widgetId( wid ) ) );
 
-  myStack->removeWidget( child( wid ) );
-
   myList.removeAll( wid );
   myInfo.remove( wid );
   myChild.remove( wid );