0027893: Visualization - AIS_InteractiveContext::SetSelected does not work

[occt.git] / src / SelectMgr / SelectMgr_SelectionManager.cxx

diff --git a/src/SelectMgr/SelectMgr_SelectionManager.cxx b/src/SelectMgr/SelectMgr_SelectionManager.cxx
index 20a10f8..3e6de7b 100644 (file)
--- a/src/SelectMgr/SelectMgr_SelectionManager.cxx
+++ b/src/SelectMgr/SelectMgr_SelectionManager.cxx
@@ -370,9 +370,10 @@ void SelectMgr_SelectionManager::Activate (const Handle(SelectMgr_SelectableObje
 
   if (myGlobal.Contains (theObject))
   {
-    if (theMode != 0 && theSelector->IsActive (theObject, 0))
+    const Standard_Integer aGlobalSelMode = theObject->GlobalSelectionMode();
+    if (theMode != aGlobalSelMode && theSelector->IsActive (theObject, aGlobalSelMode))
     {
-      theSelector->Deactivate (theObject->Selection (0));
+      theSelector->Deactivate (theObject->Selection (aGlobalSelMode));
     }
     theSelector->Activate (theObject->Selection (theMode));
   }