From f4b1320a45e99b252c7f06b0d3068e17a7a27481 Mon Sep 17 00:00:00 2001
From: akaftasev <akaftasev@opencascade.com>
Date: Wed, 14 Apr 2021 18:30:03 +0300
Subject: [PATCH] Fixing some errors

---
 src/BOPAlgo/BOPAlgo_BuilderFace.cxx  | 10 +++++-----
 src/BOPAlgo/BOPAlgo_BuilderSolid.cxx | 12 ++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
index ecf3bc6cfd..d6e64f08d9 100644
--- a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
@@ -147,27 +147,27 @@ void BOPAlgo_BuilderFace::Perform(const Message_ProgressRange& theRange)
   //
   Message_ProgressScope aPS(theRange, NULL, 1);
   CheckData();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformShapesToAvoid();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformLoops();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformAreas();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformInternalShapes();
-  if (HasErrors()) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
 }
diff --git a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
index eda7a3ebb6..95aa8b7e43 100644
--- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
@@ -127,10 +127,6 @@ void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& theRange)
   aBB.MakeCompound(aC);
   aIt.Initialize(myShapes);
   for(; aIt.More(); aIt.Next()) {
-    if (UserBreak(aPS))
-    {
-      return;
-    }
     const TopoDS_Shape& aF=aIt.Value();
     aBB.Add(aC, aF);
   }
@@ -138,22 +134,22 @@ void BOPAlgo_BuilderSolid::Perform(const Message_ProgressRange& theRange)
   
   //
   PerformShapesToAvoid();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformLoops();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformAreas();
-  if (HasErrors() && UserBreak(aPS)) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
   //
   PerformInternalShapes();
-  if (HasErrors()) {
+  if (HasErrors() || UserBreak(aPS)) {
     return;
   }
 }
-- 
2.39.5