updated copyright message

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

diff --git a/src/XGUI/XGUI_ActiveControlMgr.cpp b/src/XGUI/XGUI_ActiveControlMgr.cpp
index beffebcee689835db9609a7215e0cb397c42a781..b4cd52af819110189176d3dc2a13889b7e8a74dc 100644 (file)
--- a/src/XGUI/XGUI_ActiveControlMgr.cpp
+++ b/src/XGUI/XGUI_ActiveControlMgr.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -55,7 +55,7 @@ void XGUI_ActiveControlMgr::addSelector(XGUI_ActiveControlSelector* theSelector)
 //********************************************************************
 XGUI_ActiveControlSelector* XGUI_ActiveControlMgr::getSelector(const QString& theType)
 {
-  XGUI_ActiveControlSelector* aSelector;
+  XGUI_ActiveControlSelector* aSelector = 0;
   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
   {
     if (mySelectors[i]->getType() != theType)
@@ -93,7 +93,13 @@ void XGUI_ActiveControlMgr::onSelectorActivated()
 void XGUI_ActiveControlMgr::onSelectorDeactivated()
 {
   XGUI_ActiveControlSelector* aSelector = qobject_cast<XGUI_ActiveControlSelector*>(sender());
-  if (!aSelector || aSelector != myActiveSelector || !myActiveSelector)
+  deactivateSelector(aSelector);
+}
+
+//********************************************************************
+void XGUI_ActiveControlMgr::deactivateSelector(XGUI_ActiveControlSelector* theSelector)
+{
+  if (!theSelector || theSelector != myActiveSelector || !myActiveSelector)
     return;
 
   if (myIsBlocked) // we've come here from the same method
@@ -104,9 +110,8 @@ void XGUI_ActiveControlMgr::onSelectorDeactivated()
   activateSelector(NULL);
 
   XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
-  for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
-  {
-    if (!mySelectors[i]->needToBeActiated())
+  for (int i = 0, aCount = mySelectors.count(); i < aCount; i++) {
+    if (!mySelectors[i]->needToBeActivated())
       continue;
     aSelectorToBeActivated = mySelectors[i];
     break;