From: azv <azv@opencascade.com>
Date: Thu, 2 Jun 2016 07:40:51 +0000 (+0300)
Subject: Avoid conflicting constraints message when canceling sketch
X-Git-Tag: V_2.3.1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=681034c769c908408cfab400acb902c9f9de0da1;p=modules%2Fshaper.git

Avoid conflicting constraints message when canceling sketch
---

diff --git a/src/SketchSolver/SketchSolver_Group.cpp b/src/SketchSolver/SketchSolver_Group.cpp
index 52ff77c13..19a4a30fe 100644
--- a/src/SketchSolver/SketchSolver_Group.cpp
+++ b/src/SketchSolver/SketchSolver_Group.cpp
@@ -377,10 +377,10 @@ bool SketchSolver_Group::resolveConstraints()
       updateMultiConstraints(myConstraints);
       if (myPrevResult != STATUS_OK || myPrevResult == STATUS_UNKNOWN) {
         getWorkplane()->string(SketchPlugin_Sketch::SOLVER_ERROR())->setValue("");
-        // the error message should be changed before sending the message
-        sendMessage(EVENT_SOLVER_REPAIRED, myConflictingConstraints);
         myConflictingConstraints.clear();
         myPrevResult = STATUS_OK;
+        // the error message should be changed before sending the message
+        sendMessage(EVENT_SOLVER_REPAIRED, myConflictingConstraints);
       }
     } else {
       mySketchSolver->undo();