From df863ecd7ec91991e8cd448092d8d7218fb344c2 Mon Sep 17 00:00:00 2001 From: nds Date: Mon, 6 Oct 2008 09:54:39 +0000 Subject: [PATCH] Merging with the BR_V5_DEV branch. --- src/STD/STD_Application.cxx | 4 +++- src/STD/STD_TabDesktop.cxx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 211966bcd..8af1e6246 100755 --- 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 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 cf98dad7a..ab9d92e40 100644 --- 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" ) )); } -- 2.39.2