From: vsr Date: Tue, 25 Oct 2011 06:06:20 +0000 (+0000) Subject: 0021373: [CEA] missing some contextual menu X-Git-Tag: V6_4_0a1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d09343039a019afeb0d45b851eaead6f50f3678c;p=modules%2Fjobmanager.git 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 7e03b52..d1518ee 100644 --- 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