Merge pull request #498 from qurrent-llc/fix_dbc_delete

Fixed regression where non-commented dbc editor node would not delete

dbc/dbchandler.cpp

@@ -351,7 +351,11 @@ DBC_NODE* DBCFile::findNodeByNameAndComment(QString fullname)
     if (dbc_nodes.length() == 0) return nullptr;
     for (int i = 0; i < dbc_nodes.length(); i++)
     {
+        if(dbc_nodes[i].comment.isEmpty())
+            nameAndComment = dbc_nodes[i].name;
+        else
             nameAndComment = dbc_nodes[i].name + " - " + dbc_nodes[i].comment;
+
         if (fullname.compare(nameAndComment, Qt::CaseInsensitive) == 0)
         {
             return &dbc_nodes[i];

dbc/dbcnodeeditor.cpp

@@ -111,8 +111,11 @@ void DBCNodeEditor::showEvent(QShowEvent* event)
 
 void DBCNodeEditor::refreshView()
 {
+    if(dbcNode)
+    {
         ui->lineComment->setText(dbcNode->comment);
         ui->lineMsgName->setText(dbcNode->name);
+    }
 
     //generateSampleText();
 }