Fix object self-connecting after removing it from a connection

plugdata-team · Feb 16, 2025 · fd3d93a · fd3d93a
1 parent b038cc9
commit fd3d93a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Source/Object.cpp b/Source/Object.cpp
@@ -1089,9 +1089,8 @@ void Object::mouseDrag(MouseEvent const& e)
 
                     if (checkedOut && checkedIn) {
                         cnv->patch.removeConnection(checkedOut, c->outIdx, checkedIn, c->inIdx, c->getPathState());
-
-                        cnv->connections.add(cnv, outlet, c->inlet, nullptr);
                         cnv->connections.remove_one(c);
+                        cnv->connections.add(cnv, outlet, c->inlet, nullptr);
                     }
                 }
 
@@ -1161,8 +1160,8 @@ void Object::mouseDrag(MouseEvent const& e)
             if (object->numInputs && object->numOutputs && !object->iolets.empty()) {
                 bool intersected = false;
                 for (auto* connection : cnv->connections) {
-
-                    if (connection->intersectsRectangle(object->iolets[0]->getCanvasBounds())) {
+                    if (connection->intersectsRectangle(object->iolets[0]->getCanvasBounds()) &&
+                        !iolets.contains(connection->inlet) && !iolets.contains(connection->outlet)) {
                         object->iolets[0]->isTargeted = true;
                         object->iolets[object->numInputs]->isTargeted = true;
                         object->iolets[0]->repaint();
@@ -1173,7 +1172,6 @@ void Object::mouseDrag(MouseEvent const& e)
                         break;
                     }
                 }
-
                 if (!intersected) {
                     object->iolets[0]->isTargeted = false;
                     object->iolets[object->numInputs]->isTargeted = false;

diff --git a/Source/Utility/Containers.h b/Source/Utility/Containers.h
@@ -2233,6 +2233,12 @@ class PooledPtrArray {
         return data_.back();
     }
 
+    template<typename U>
+    [[nodiscard]] bool contains(U const& to_find) const
+    {
+        return std::find(this->begin(), this->end(), to_find) != this->end();
+    }
+
     // Other necessary methods, simplified
     bool empty() const { return data_.empty(); }
     bool not_empty() const { return !data_.empty(); }