Editor: Delete item from internal list only when action accepts (#178)

Author: thedmd

docs/CHANGELOG.txt

@@ -204,4 +204,6 @@ v0.9.1 (WIP):
 
     BUGFIX: Application: Recreate DX11 resources lazily (related to #162)
 
-    BUGFIX: Editor: Don't steal input from active user widget (#172)
+    BUGFIX: Editor: Don't steal input from active user widget (#172)
+
+    BUGFIX: Editor: Delete item from internal list only when action accepts (#178)

imgui_node_editor.cpp

@@ -5081,13 +5081,12 @@ void ed::DeleteItemsAction::RejectItem()
 
     m_UserAction = Rejected;
 
-    RemoveItem(false);
+    DropCurrentItem();
 }
 
 void ed::DeleteItemsAction::RemoveItem(bool deleteDependencies)
 {
-    auto item = m_CandidateObjects[m_CandidateItemIndex];
-    m_CandidateObjects.erase(m_CandidateObjects.begin() + m_CandidateItemIndex);
+    auto item = DropCurrentItem();
 
     Editor->DeselectObject(item);
 
@@ -5106,6 +5105,14 @@ void ed::DeleteItemsAction::RemoveItem(bool deleteDependencies)
         Editor->NotifyLinkDeleted(item->AsLink());
 }
 
+ed::Object* ed::DeleteItemsAction::DropCurrentItem()
+{
+    auto item = m_CandidateObjects[m_CandidateItemIndex];
+    m_CandidateObjects.erase(m_CandidateObjects.begin() + m_CandidateItemIndex);
+
+    return item;
+}
+
 
 
 

imgui_node_editor_internal.h

@@ -1156,6 +1156,7 @@ struct DeleteItemsAction final: EditorAction
 
     bool QueryItem(ObjectId* itemId, IteratorType itemType);
     void RemoveItem(bool deleteDependencies);
+    Object* DropCurrentItem();
 
     vector<Object*> m_ManuallyDeletedObjects;