From 9ba657869c431869e6135bd26ba52ae63f964e8b Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Fri, 12 Jan 2018 14:05:58 +0300
Subject: [PATCH] Issue #2400: The bug appears because of unsynchronized
 selection in viewer and object browser

---
 src/XGUI/XGUI_ModuleConnector.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 34b7d462c..4f2130509 100644
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -29,6 +29,7 @@
 #include "XGUI_PropertyPanel.h"
 #include "XGUI_ActionsMgr.h"
 #include "XGUI_ErrorMgr.h"
+#include "XGUI_ObjectsBrowser.h"
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_ViewerPrs.h>
@@ -118,10 +119,21 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
 void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
+  XGUI_ObjectsBrowser* aBrowser = myWorkshop->objectBrowser();
   if (theValues.isEmpty()) {
     myWorkshop->selector()->clearSelection();
-  } else
+    aBrowser->treeView()->clearSelection();
+  } else {
     aDisp->setSelected(theValues);
+    // Synchronise the selection with Object browser
+    QObjectPtrList anObjects;
+    foreach(ModuleBase_ViewerPrsPtr aVal, theValues) {
+      anObjects.append(aVal->object());
+    }
+    bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
+    aBrowser->setObjectsSelected(anObjects);
+    myWorkshop->objectBrowser()->blockSignals(aBlocked);
+  }
 }
 
 void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
-- 
2.30.2