t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed regression where non-commented node would not delete

Browse Source 
Fixed odd crash due to dbcNode being null on refresh
This commit is contained in:
Andy Huska
2022-09-20 07:46:30 -05:00
parent 7e4ebf2c74
commit 13c920f971
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+4
View File
@@ -351,7 +351,11 @@ DBC_NODE* DBCFile::findNodeByNameAndComment(QString fullname)
if (dbc_nodes.length() == 0) return nullptr; if (dbc_nodes.length() == 0) return nullptr;
for (int i = 0; i < dbc_nodes.length(); i++) 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; nameAndComment = dbc_nodes[i].name + " - " + dbc_nodes[i].comment;
if (fullname.compare(nameAndComment, Qt::CaseInsensitive) == 0) if (fullname.compare(nameAndComment, Qt::CaseInsensitive) == 0)
{ {
return &dbc_nodes[i]; return &dbc_nodes[i];
dbc/dbcnodeeditor.cpp
+3
View File
@@ -111,8 +111,11 @@ void DBCNodeEditor::showEvent(QShowEvent* event)
void DBCNodeEditor::refreshView() void DBCNodeEditor::refreshView()
{ {
if(dbcNode)
{
ui->lineComment->setText(dbcNode->comment); ui->lineComment->setText(dbcNode->comment);
ui->lineMsgName->setText(dbcNode->name); ui->lineMsgName->setText(dbcNode->name);
}
//generateSampleText(); //generateSampleText();
} }