Fix for the bug IPAL22807:"TC6.4.0: input objects are not highlighted in 3D viewer"

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index 89d129e532875278a8a13369db43ea82fed0d046..42718d0461dbc4b8ee6de18675e2f42622bbdf0b 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -262,22 +262,23 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
     QString aName = GEOMBase::GetName( aSelectedObject.get() );
 
     myEditCurrentArgument->setText(aName);
-  
-    // clear selection
-    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-    myGeomGUI->getApp()->selectionMgr()->clearSelected();
-    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-           this, SLOT(SelectionIntoArgument()));
     
     if (myEditCurrentArgument == GroupPoints->LineEdit1) {
       myPoint = aSelectedObject;
       if (myPoint && !myDir)
-       GroupPoints->PushButton2->click();
+        GroupPoints->PushButton2->click();
     }
     else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
       myDir = aSelectedObject;
       if (myDir && !myPoint)
-       GroupPoints->PushButton1->click();
+        GroupPoints->PushButton1->click();
+    }
+    // clear selection
+    if ((myDir && !myPoint) || (myPoint && !myDir)) {
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      myGeomGUI->getApp()->selectionMgr()->clearSelected();
+      connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+             this, SLOT(SelectionIntoArgument()));
     }
   }