Merging with the BR_V5_DEV branch.

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 211966bcd6a566c670af27d0130d891b1a99b958..8af1e624691eeae57c0e0dbdfbdad14d8affd106 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -349,7 +349,6 @@ void STD_Application::onCloseDoc( bool ask )
   clearViewManagers();
 
   setActiveStudy( 0 );
-  delete study;
 
   int aNbStudies = 0;
   QList<SUIT_Application*> apps = SUIT_Session::session()->applications();
@@ -367,6 +366,9 @@ void STD_Application::onCloseDoc( bool ask )
     updateCommandsStatus();
   }
 
+  // IPAL19532: deleting study should be performed after calling setDesktop(0)
+  delete study;
+
   afterCloseDoc();
 
   if ( !desktop() )

diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index cf98dad7ae09f632d77c166e822798d356f3121b..ab9d92e4058145a3db4440f0a4a47fbb51cac5df 100644 (file)
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.cxx
@@ -59,9 +59,9 @@ myWorkstackAction( 0 )
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   if ( resMgr ) {
     myWorkstack->setIcon( QtxWorkstack::SplitVertical,   
-                         resMgr->loadPixmap( "STD", tr( "ICON_DESK_WINDOW_HSPLIT" ) ) );
-    myWorkstack->setIcon( QtxWorkstack::SplitHorizontal,
                          resMgr->loadPixmap( "STD", tr( "ICON_DESK_WINDOW_VSPLIT" ) ) );
+    myWorkstack->setIcon( QtxWorkstack::SplitHorizontal,
+                         resMgr->loadPixmap( "STD", tr( "ICON_DESK_WINDOW_HSPLIT" ) ) );
     myWorkstack->setIcon( QtxWorkstack::Close,
                          resMgr->loadPixmap( "STD", tr( "ICON_FILE_CLOSE" ) ));
   }