From: mkr <mkr@opencascade.com>
Date: Thu, 13 Apr 2006 14:05:11 +0000 (+0000)
Subject: Fix for IPAL12128 : CRASH after trying to run dataflow from the restored study with... 
X-Git-Tag: T3_2_0b1_pre1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d9dd5e1f74846314a4a1cea2c29925c8e6e29099;p=modules%2Fgeom.git

Fix for IPAL12128 : CRASH after trying to run dataflow from the restored study with SALOME started with "--gui" key.
---

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index ff1ebd242..38455e4ce 100644
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -108,8 +108,12 @@ void GEOM_Superv_i::SetStudyID( CORBA::Long theId )
     SALOME::Session_var aSession = SALOME::Session::_narrow(anObject);
     if ( !CORBA::is_nil(aSession) ) {
       int aStudyID = aSession->GetActiveStudyId();
-      if ( theId != aStudyID ) MESSAGE("Warning : given study ID theId="<<theId<<" is wrong and will be replaced by the value "<<aStudyID);
-      myStudyID = aStudyID;
+      if ( theId != aStudyID && aStudyID > 0) { // mkr : IPAL12128
+	MESSAGE("Warning : given study ID theId="<<theId<<" is wrong and will be replaced by the value "<<aStudyID);
+	myStudyID = aStudyID;
+      }
+      else
+	myStudyID = theId; // mkr : IPAL12128
     }
   }