From: nds <nds@opencascade.com>
Date: Tue, 11 Apr 2017 11:08:10 +0000 (+0300)
Subject: Issue #2123: Unexpected Sketcher behavior when creating Coincidence
X-Git-Tag: V_2.7.0~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c27ab5eb4e59d6f3a592499294bb26b75d3cc971;p=modules%2Fshaper.git

Issue #2123: Unexpected Sketcher behavior when creating Coincidence
---

diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp
index ca6c1b1bc..ad7eb2edd 100644
--- a/src/ModuleBase/ModuleBase_IModule.cpp
+++ b/src/ModuleBase/ModuleBase_IModule.cpp
@@ -90,7 +90,6 @@ void ModuleBase_IModule::launchOperation(const QString& theCmdId,
                                                          (myWorkshop->currentOperation());
   QString anOperationKind = aCurOperation ? aCurOperation->getDescription()->operationId() : "";
 
-
   bool isCommitted;
   if (!myWorkshop->canStartOperation(theCmdId, isCommitted))
     return;
@@ -106,9 +105,10 @@ void ModuleBase_IModule::launchOperation(const QString& theCmdId,
     if (aMessage.get()) {
       setReentrantPreSelection(aMessage);
     }
-    else if (anOperationKind == theCmdId) // restore of selection only if the kind is the same
+    else if (anOperationKind.isEmpty() || anOperationKind == theCmdId) {
+      // restore of previous opeation is absent or new launched operation has the same kind
       aFOperation->initSelection(aPreSelected);
-
+    }
     workshop()->processLaunchOperation(aFOperation);
 
     if (aFOperation) {