Do not enter an infinite loop in mergePoints.

sfrias · Mar 6, 2021 · adf8135 · adf8135
1 parent df0c49a
commit adf8135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/core/canvas.h b/src/core/canvas.h
@@ -190,7 +190,7 @@ class CORE_EXPORT Canvas : public CanvasBase {
 
     void mergePoints();
     void disconnectPoints();
-    void connectPoints();
+    bool connectPoints();
     void subdivideSegments();
 
     void setSelectedTextAlignment(const Qt::Alignment alignment) const;

diff --git a/src/core/canvasselectedpointsactions.cpp b/src/core/canvasselectedpointsactions.cpp
@@ -34,7 +34,7 @@ QList<SmartNodePoint*> Canvas::getSortedSelectedNodes() {
     return nodes;
 }
 
-void Canvas::connectPoints() {
+bool Canvas::connectPoints() {
     prp_pushUndoRedoName("Connect Nodes");
     const auto nodes = getSortedSelectedNodes();
     QList<SmartNodePoint*> endNodes;
@@ -57,8 +57,9 @@ void Canvas::connectPoints() {
             const int targetId2 = node2->getNodeId();
             const auto sel2 = handler->getPointWithId<SmartNodePoint>(targetId2);
             addPointToSelection(sel2);
-        }
+        } else return false;
     }
+    return true;
 }
 
 void Canvas::disconnectPoints() {
@@ -86,8 +87,8 @@ void Canvas::mergePoints() {
                            firstPoint->getNextPoint() == secondPoint;
         if(!ends && !neigh) return;
         if(ends) {
-            connectPoints();
-            mergePoints();
+            const bool success = connectPoints();
+            if(success) mergePoints();
             return;
         }
         removePointFromSelection(secondPoint);