Fix bug in studyedit

diff --git a/src/KERNEL_PY/kernel/studyedit.py b/src/KERNEL_PY/kernel/studyedit.py
index f31c6ede641532afea89b8d6735b5ec208ffd260..8d7c1a3ab4c324247b32e30c5c629caedcb063b5 100644 (file)
--- a/src/KERNEL_PY/kernel/studyedit.py
+++ b/src/KERNEL_PY/kernel/studyedit.py
@@ -40,9 +40,13 @@ def getActiveStudyId():
     ``salome.myStudyId`` variable.
     """
     salome.salome_init()
-    # _GBO_WARN: note that salome.getActiveStudy() returns an id. It
-    # should return the study or be renammed in getActiveStudyId.
-    return salome.getActiveStudy()
+    # Warning: we don't use salome.getActiveStudy() here because it doesn't
+    # work properly when called from Salome modules (multi-study interpreter
+    # issue)
+    if salome.hasDesktop():
+        return salome.sg.getActiveStudyId()
+    else:
+        return salome.myStudyId
 
 def getActiveStudy():
     return salome.myStudyManager.GetStudyByID(getActiveStudyId())