From 37b9c821e5230c3a1d1a02b20dd0fcbb4871bd76 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Sun, 19 Sep 2021 18:55:25 -0400
Subject: [PATCH] Fix crash when deleting nodes in DBC editor

---
 dbc/dbcmaineditor.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dbc/dbcmaineditor.cpp b/dbc/dbcmaineditor.cpp
index 98b8728..28e831a 100644
--- a/dbc/dbcmaineditor.cpp
+++ b/dbc/dbcmaineditor.cpp
@@ -723,15 +723,20 @@ void DBCMainEditor::deleteNode(DBC_NODE *node)
         if (dbcFile->messageHandler->findMsgByIdx(i)->sender == node) deleteMessage(dbcFile->messageHandler->findMsgByIdx(i));
     }
 
-    for (int j = 0; j < dbcFile->dbc_nodes.count(); j++)
-    {
-        if (dbcFile->dbc_nodes.at(j).name == node->name) dbcFile->dbc_nodes.removeAt(j);
-    }
-
     nodeToItem.remove(node);
     itemToNode.remove(currItem);
     ui->treeDBC->removeItemWidget(currItem, 0);
     delete currItem;
+
+    for (int j = 0; j < dbcFile->dbc_nodes.count(); j++)
+    {
+        if (dbcFile->dbc_nodes.at(j).name == node->name)
+        {
+            dbcFile->dbc_nodes.removeAt(j);
+            break;
+        }
+    }
+
     dbcFile->setDirtyFlag();
 }