Multi-study support removal: finalization

[modules/gui.git] / src / SalomeApp / SalomeApp_PyInterp.cxx

diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx
index 3adde1b6be2c319e0192abedb15dd88242be7f0d..1107c03a36c6f8aee88052f18fac9233800efd5d 100755 (executable)
--- a/src/SalomeApp/SalomeApp_PyInterp.cxx
+++ b/src/SalomeApp/SalomeApp_PyInterp.cxx
@@ -37,7 +37,7 @@
  * initstate & initcontext redefined here.
  */
 SalomeApp_PyInterp::SalomeApp_PyInterp(): 
-  PyConsole_EnhInterp(), myFirstRun( true )
+  PyConsole_EnhInterp(), myFirstRun( true ), myFirstInitStudy( false )
 {
 }
 
@@ -68,7 +68,10 @@ int SalomeApp_PyInterp::beforeRun()
     int ret = simpleRun( "from Help import *", false );
     if ( ret )
       return ret;
-    ret = simpleRun( "import salome", false );
+  }
+  if( myFirstInitStudy ) {
+    myFirstInitStudy = false;
+    int ret = simpleRun( "import salome", false );
     if (ret)
       return ret;
     ret = simpleRun( "salome.salome_init(0,1)", false );
@@ -78,8 +81,14 @@ int SalomeApp_PyInterp::beforeRun()
   return true;
 }
 
+void SalomeApp_PyInterp::initStudy()
+{
+  myFirstInitStudy = true;
+}
+
 void SalomeApp_PyInterp::closeContext()
 {
-    simpleRun( "import salome", false );
-    simpleRun( "salome.salome_close()", false );
+  myFirstInitStudy = false;
+  simpleRun( "import salome", false );
+  simpleRun( "salome.salome_close()", false );
 }