Use a global property instead of local variable

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index aeabb7a47842037968ce68dfd39e304f5df74c75..fd2b0b9480ba3f4085de66256f7552c174a46052 100644 (file)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -101,6 +101,7 @@ CAM_Application::CAM_Application( const bool autoLoad )
   myAutoLoad( autoLoad ),
   myBlocked( false )
 {
+  setProperty("activateModule", false);
   readModuleList();
 }
 
@@ -417,7 +418,7 @@ bool CAM_Application::activateModule( const QString& modName )
   bool res = false;
   if ( !modName.isEmpty() )
   {
-    myActvatingModule = modName;
+    setProperty("activateModule", true);
     CAM_Module* mod = module( modName );
     if ( !mod )
       mod = loadModule( modName );
@@ -425,7 +426,7 @@ bool CAM_Application::activateModule( const QString& modName )
 
     if ( mod )
       res = activateModule( mod );
-    myActvatingModule = QString();
+    setProperty("activateModule", false);
   }
   else
     res = activateModule( 0 );

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 0dae7d11fa548659fc3e880d360893e32cb43e70..b0b69d3f6423aba76ae753b6dc49e3514272a724 100644 (file)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -94,8 +94,6 @@ protected:
 
   virtual bool        abortAllOperations();
 
-  QString             actvatingModule() const { return myActvatingModule; }
-
 private:
   void                readModuleList();
 
@@ -113,7 +111,6 @@ private:
   static ModuleInfoList myInfoList;      //!< modules info list
   bool                  myAutoLoad;      //!< auto loading flag
   bool                  myBlocked;       //!< "blocked" flag, internal usage
-  QString               myActvatingModule; //!< Name of currently activating module.
 };
 
 #ifdef WIN32

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 14a63145c90b5525dc8ef2b692fa6e49b41b737c..6440bbf1f5ab885b9d004d3cf375e84db1a948f0 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -4960,7 +4960,7 @@ void LightApp_Application::onDesktopMessage( const QString& message )
     QString moduleName = message.split( sectionSeparator ).last();
     // Check name of current activating module name in order to avoid ciclik 
     // call because of messages
-    if (actvatingModule().isNull()) {
+    if (!property("activateModule").toBool()) {
       CAM_Module* mod = module(moduleName);
       if (!mod)
         mod = module(moduleTitle(moduleName));