From c7b2185163980365ace395ea8d28e221b5e0a1cc Mon Sep 17 00:00:00 2001
From: azv <azv@opencascade.com>
Date: Mon, 30 May 2016 12:36:00 +0300
Subject: [PATCH] Remove error status when the group with conflicting
 constraint is deleted (issue #1520)

---
 src/SketchSolver/SketchSolver_Group.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SketchSolver/SketchSolver_Group.cpp b/src/SketchSolver/SketchSolver_Group.cpp
index 639af961c..ed6b91239 100644
--- a/src/SketchSolver/SketchSolver_Group.cpp
+++ b/src/SketchSolver/SketchSolver_Group.cpp
@@ -328,7 +328,7 @@ bool SketchSolver_Group::resolveConstraints()
 {
   bool aResolved = false;
   bool isGroupEmpty = isEmpty() && myStorage->isEmpty();
-  if (myStorage->isNeedToResolve() && !isGroupEmpty) {
+  if (myStorage->isNeedToResolve() && (!isGroupEmpty || !myConflictingConstraints.empty())) {
     if (!mySketchSolver)
       mySketchSolver = SketchSolver_Manager::instance()->builder()->createSolver();
 
-- 
2.39.2