From 016731c0f4f61913046cfac7ee8f05c85e8fb2a5 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 18 Nov 2015 15:24:27 +0300 Subject: [PATCH 1/1] The sketch solver error should be checked after nested sketch operation check. The sketch operation should not be committed --- src/PartSet/PartSet_SketcherReetntrantMgr.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/PartSet/PartSet_SketcherReetntrantMgr.cpp b/src/PartSet/PartSet_SketcherReetntrantMgr.cpp index 5e45abfee..5239265c7 100755 --- a/src/PartSet/PartSet_SketcherReetntrantMgr.cpp +++ b/src/PartSet/PartSet_SketcherReetntrantMgr.cpp @@ -181,18 +181,17 @@ void PartSet_SketcherReetntrantMgr::onNoMoreWidgets(const std::string& thePrevio if (!myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()) return; - bool isStarted = false; - bool isSketchSolverError = module()->sketchMgr()->sketchSolverError(); - if (!isSketchSolverError && - aFOperation && PartSet_SketcherMgr::isNestedSketchOperation(aFOperation)) { - if (myRestartingMode != RM_Forbided) { - myRestartingMode = RM_LastFeatureUsed; - isStarted = startInternalEdit(thePreviousAttributeID); + if (aFOperation && PartSet_SketcherMgr::isNestedSketchOperation(aFOperation)) { + bool isStarted = false; + if (!module()->sketchMgr()->sketchSolverError()) { + if (myRestartingMode != RM_Forbided) { + myRestartingMode = RM_LastFeatureUsed; + isStarted = startInternalEdit(thePreviousAttributeID); + } } + if (!isStarted) + aFOperation->commit(); } - - if (!isStarted) - aFOperation->commit(); } bool PartSet_SketcherReetntrantMgr::processEnter(const std::string& thePreviousAttributeID) -- 2.39.2