Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / XGUI / XGUI_ActiveControlMgr.cpp

diff --git a/src/XGUI/XGUI_ActiveControlMgr.cpp b/src/XGUI/XGUI_ActiveControlMgr.cpp
index 73b7ac61022dac09b4890fac3a285fa64530181d..7176e061e45c8bbb407b245b285853a173b85e01 100644 (file)
--- a/src/XGUI/XGUI_ActiveControlMgr.cpp
+++ b/src/XGUI/XGUI_ActiveControlMgr.cpp
@@ -21,6 +21,7 @@
 #include "XGUI_ActiveControlMgr.h"
 #include "XGUI_ActiveControlSelector.h"
 #include "XGUI_SelectionActivate.h"
+#include "XGUI_SelectionMgr.h"
 #include "XGUI_Tools.h"
 #include "XGUI_Workshop.h"
 
@@ -33,13 +34,13 @@
 void debugInfo(const QString& theMessage, XGUI_ActiveControlSelector* theSelector)
 {
   std::cout << theMessage.toStdString().c_str() << ", active: "
-    << theSelector ? theSelector->getType().toStdString().c_str() : "NULL" << std::endl;
+    << (theSelector ? theSelector->getType().toStdString().c_str() : "NULL") << std::endl;
 }
 #endif
 
 //********************************************************************
 XGUI_ActiveControlMgr::XGUI_ActiveControlMgr(ModuleBase_IWorkshop* theWorkshop)
-: myWorkshop(theWorkshop), myActiveSelector(0)
+: myWorkshop(theWorkshop), myActiveSelector(0), myIsBlocked(false)
 {
   connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
 }
@@ -73,9 +74,12 @@ void XGUI_ActiveControlMgr::onSelectorActivated()
   if (!aSelector || aSelector == myActiveSelector)
     return;
 
-  if (myActiveSelector)
+  if (myIsBlocked) // we've come here from the same method
+    return;
+  myIsBlocked = true;
+  if (myActiveSelector) {
     myActiveSelector->setActive(false);
-
+  }
   activateSelector(aSelector);
   XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionModes();
   XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionFilters();
@@ -83,6 +87,7 @@ void XGUI_ActiveControlMgr::onSelectorActivated()
 #ifdef DEBUG_ACTIVE_SELECTOR
   debugInfo("onSelectorActivated", myActiveSelector);
 #endif
+  myIsBlocked = false;
 }
 
 //********************************************************************
@@ -92,6 +97,10 @@ void XGUI_ActiveControlMgr::onSelectorDeactivated()
   if (!aSelector || aSelector != myActiveSelector || !myActiveSelector)
     return;
 
+  if (myIsBlocked) // we've come here from the same method
+    return;
+  myIsBlocked = true;
+
   myActiveSelector->setActive(false);
   activateSelector(NULL);
 
@@ -111,6 +120,7 @@ void XGUI_ActiveControlMgr::onSelectorDeactivated()
 #ifdef DEBUG_ACTIVE_SELECTOR
   debugInfo("onSelectorDeactivated", myActiveSelector);
 #endif
+  myIsBlocked = false;
 }
 
 //********************************************************************