Salome HOME
fix problem with clear study by GUI
authormpa <mpa@opencascade.com>
Fri, 30 Dec 2016 14:42:19 +0000 (17:42 +0300)
committermpa <mpa@opencascade.com>
Fri, 30 Dec 2016 14:42:19 +0000 (17:42 +0300)
src/SALOMEDS/SALOMEDS_Study.cxx

index 8b14dd00386865ae1820d84d8a2864fa627550c4..a23708898d5ee2ab0c32512bab6638e77d28d17d 100644 (file)
@@ -107,22 +107,18 @@ void SALOMEDS_Study::InitORB()
 
 void SALOMEDS_Study::Init()
 {
-  if (_isLocal) {
-    SALOMEDS::Locker lock;
-    _local_impl->Init();
-  }
-  else
-    _corba_impl->Init();
+  if(CORBA::is_nil(_corba_impl))
+    return;
+
+  _corba_impl->Init();
 }
 
 void SALOMEDS_Study::Clear()
 {
-  if (_isLocal) {
-    SALOMEDS::Locker lock;
-    _local_impl->Clear();
-  }
-  else
-    _corba_impl->Clear();
+  if(CORBA::is_nil(_corba_impl))
+    return;
+
+  _corba_impl->Clear();
 }
 
 bool SALOMEDS_Study::Open(const std::string& theStudyUrl)