Fixed removal of object reference arrow when deleting target object

Closes #2944
mapeditor · Dec 8, 2020 · 403fc19 · 403fc19
1 parent e2cccee
commit 403fc19
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/tiled/objectselectionitem.cpp b/src/tiled/objectselectionitem.cpp
@@ -557,9 +557,10 @@ void ObjectSelectionItem::objectsAboutToBeRemoved(const QList<MapObject *> &obje
             delete mObjectLabels.take(object);
 
     for (MapObject *object : objects) {
+        // Remove any references originating from this object
         auto it = mReferencesBySourceObject.find(object);
         if (it != mReferencesBySourceObject.end()) {
-            QList<ObjectReferenceItem*> &items = *it;
+            const QList<ObjectReferenceItem*> &items = *it;
             for (auto item : items) {
                 auto &itemsByTarget = mReferencesByTargetObject[item->targetObject()];
                 itemsByTarget.removeOne(item);
@@ -570,6 +571,21 @@ void ObjectSelectionItem::objectsAboutToBeRemoved(const QList<MapObject *> &obje
             }
             mReferencesBySourceObject.erase(it);
         }
+
+        // Remove any references pointing to this object
+        it = mReferencesByTargetObject.find(object);
+        if (it != mReferencesByTargetObject.end()) {
+            const QList<ObjectReferenceItem*> &items = *it;
+            for (auto item : items) {
+                auto &itemsBySource = mReferencesBySourceObject[item->sourceObject()];
+                itemsBySource.removeOne(item);
+                if (itemsBySource.isEmpty())
+                    mReferencesBySourceObject.remove(item->sourceObject());
+
+                delete item;
+            }
+            mReferencesByTargetObject.erase(it);
+        }
     }
 }