Merge with OCC-V2_1_0_deb

[modules/geom.git] / src / BlocksGUI / BlocksGUI_ExplodeDlg.cxx

diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index be34aa1165c65ef5ab02e43a522e73f26f1c6933..30a03c621aa30fc83598f3aae5d984e2583a29ca 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -315,9 +315,12 @@ void BlocksGUI_ExplodeDlg::activateSelection()
   erasePreview(true);
 
   if (isAllSubShapes()) { // Sub-shapes selection disabled
+    disconnect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
     globalSelection( GEOM_ALLSHAPES );
-    SelectionIntoArgument();
-
+    if (myObject->_is_nil()) {
+      SelectionIntoArgument();
+    }
+    connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
   } else {
     displayPreview(true, true, false);
     globalSelection(GEOM_PREVIEW);