0021373: [CEA] missing some contextual menu

0021307: EDF PARAVIS: Mismatch in buttons and windows when switching from a component to PARAVIS and back (replace previous fix)

diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx
index 7e03b5271489eabb4d43e9263644bb46337fdb24..d1518ee8b9ec808e7799337d10d577d40a23fdbe 100644 (file)
--- a/src/salomegui/BL_SalomeGui.cxx
+++ b/src/salomegui/BL_SalomeGui.cxx
@@ -121,8 +121,8 @@ BL::SalomeGui::onWindowActivated( SUIT_ViewWindow* svw)
   
   if (_viewWin) // Be sure to have a _viewWindow
     if (svw->getId() == _viewWin->getId()) // Same Id ?
-      if (getApp()->activeModule() && getApp()->activeModule()->moduleName().compare("JobManager") != 0) // JobManager already activated ?
-        getApp()->activateModule("JobManager");
+      if (!getApp()->activeModule() || getApp()->activeModule()->moduleName() != "JobManager") // JobManager already activated ?
+        if ( !getApp()->activateModule("JobManager") ) return;
 }
 
 // --- Export the module