Fixing some errors

diff --git a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx
index ecf3bc6cfd885455e8b3c6697a6604f5b7ef2570..d6e64f08d9f09941f7ae88a8fdede6017540b6ad 100644 (file)
--- 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 eda7a3ebb6602d167f7cba44581dcff6614fb827..95aa8b7e43fac564d6f9f66ea67a81c2d4461ca8 100644 (file)
--- 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;
   }
 }