Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintMiddle.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp b/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
index 2a1c1c421079065910f621727c88fdb5a78a9da4..4865f4dd9941696d67c0fc16c40320c9f0af3b69 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
@@ -1,4 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <SketchSolver_ConstraintMiddle.h>
 #include <PlaneGCSSolver_ConstraintWrapper.h>
@@ -14,7 +32,7 @@ void SketchSolver_ConstraintMiddle::getAttributes(
 void SketchSolver_ConstraintMiddle::notify(const FeaturePtr&      theFeature,
                                            PlaneGCSSolver_Update* theUpdater)
 {
-  if (theFeature == myBaseConstraint)
+  if (theFeature == myBaseConstraint && myInSolver)
     return; // the constraint is already being updated
 
   PlaneGCSSolver_UpdateCoincidence* anUpdater =
@@ -45,8 +63,8 @@ void SketchSolver_ConstraintMiddle::notify(const FeaturePtr&      theFeature,
     }
   } else {
     if (myInSolver) {
-      myInSolver = false;
       myStorage->removeConstraint(myBaseConstraint);
+      myInSolver = false;
     }
 
     if (!myMiddle) {