Fixed bug IPAL20746 - DPE: crash on the second update study

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index 446863fa29d813887f7783a65b753c79fb6d1dd2..62f1b57da1a3a2b5ec63b3d18804f777e3af237b 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -29,6 +29,7 @@
 
 #include <CAM_Module.h>
 
+#include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
@@ -936,6 +937,9 @@ bool SalomeApp_NoteBookDlg::updateStudy()
   // clear a study (delete all objects)
   clearStudy();
 
+  // get active application
+  app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+
   // load study from the temporary directory
   QString command = QString( "execfile(\"%1\")" ).arg( aTmpDir + QDir::separator() + aFileName + ".py" );
 
@@ -976,6 +980,25 @@ void SalomeApp_NoteBookDlg::clearStudy()
   if( !app )
     return;
 
+  QList<SUIT_Application*> aList = SUIT_Session::session()->applications();
+  int anIndex = aList.indexOf( app );
+
+  if( anIndex > 0 )
+    setParent( 0 );
+
   app->onCloseDoc( false );
+
+  if( anIndex > 0 && anIndex < aList.count() )
+    app = dynamic_cast<SalomeApp_Application*>( aList[ anIndex - 1 ] );
+
+  if( !app )
+    return;
+
   app->onNewDoc();
+
+  app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  if( anIndex > 0 && app ) {
+    setParent( app->desktop(), Qt::Dialog );
+    show();
+  }
 }