Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / PartSet / PartSet_OperationFeatureBase.cpp

diff --git a/src/PartSet/PartSet_OperationFeatureBase.cpp b/src/PartSet/PartSet_OperationFeatureBase.cpp
index e369667bbdc1a396791a87befb34e52e1fff88a3..c1da278fa020868570d496073c97f06c748d4924 100644 (file)
--- a/src/PartSet/PartSet_OperationFeatureBase.cpp
+++ b/src/PartSet/PartSet_OperationFeatureBase.cpp
@@ -134,12 +134,14 @@ void PartSet_OperationFeatureBase::activateByPreselection()
     aValue.setObject(aPrs.object());
     if (myActiveWidget->setValue(&aValue)) {
       myPreSelection.remove(aPrs);
-      emit activateNextWidget(myActiveWidget);
+      if(isValid()) {
+        myActiveWidget = NULL;
+        commit();
+      } else {
+        emit activateNextWidget(myActiveWidget);
+      }
     }
     // If preselection is enough to make a valid feature - apply it immediately
-    if(isValid()) {
-      commit();
-    }
   }
 }