From: nds <nds@opencascade.com>
Date: Mon, 6 Jun 2016 06:27:41 +0000 (+0300)
Subject: Correction for selector(greed) widgets. Using preselection.
X-Git-Tag: V_2.4.0~141^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d2337ff94a9db7aa38997a369c1cca470a3297c;p=modules%2Fshaper.git

Correction for selector(greed) widgets. Using preselection.
---

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.cpp b/src/ModuleBase/ModuleBase_OperationFeature.cpp
index 79d72de89..82cf7906b 100755
--- a/src/ModuleBase/ModuleBase_OperationFeature.cpp
+++ b/src/ModuleBase/ModuleBase_OperationFeature.cpp
@@ -383,10 +383,14 @@ ModuleBase_ModelWidget* ModuleBase_OperationFeature::activateByPreselection(
           aWgt = (*aWIt);
           if (aWgt->attributeID() == theGreedAttributeId) {
             aPropertyPanel->setPreselectionWidget(aWgt);
-            aWgt->setSelection(myPreSelection, true);
-            aPropertyPanel->setPreselectionWidget(NULL);
-            aFilledWgt = aWgt;
-            break;
+            if (aWgt->setSelection(myPreSelection, true)) {
+              aPropertyPanel->setPreselectionWidget(NULL);
+              aFilledWgt = aWgt;
+              break;
+            }
+            else { // do not process invalid for greed widget selection
+              break;
+            }
           }
         }
       }