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

Address crash (OSX platform, at least) when deleting empty node or message

Browse Source
This commit is contained in:
Mark Webb-Johnson
2019-07-21 20:35:12 +08:00
parent 2426cf177e
commit 492b08d4f3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbcmaineditor.cpp
+6 -2
View File
@@ -152,7 +152,9 @@ void DBCMainEditor::onCustomMenuMessage(QPoint point)
void DBCMainEditor::deleteCurrentNode() void DBCMainEditor::deleteCurrentNode()
{ {
int thisRow = ui->NodesTable->currentRow(); int thisRow = ui->NodesTable->currentRow();
QString nodeName = ui->NodesTable->item(thisRow, 0)->text(); QTableWidgetItem* thisItem = ui->NodesTable->item(thisRow, 0);
if (!thisItem) return;
QString nodeName = thisItem->text();
if (nodeName.length() > 0 && nodeName.compare("Vector__XXX", Qt::CaseInsensitive) != 0) if (nodeName.length() > 0 && nodeName.compare("Vector__XXX", Qt::CaseInsensitive) != 0)
{ {
ui->NodesTable->removeRow(thisRow); ui->NodesTable->removeRow(thisRow);
@@ -167,7 +169,9 @@ void DBCMainEditor::deleteCurrentNode()
void DBCMainEditor::deleteCurrentMessage() void DBCMainEditor::deleteCurrentMessage()
{ {
int thisRow = ui->MessagesTable->currentRow(); int thisRow = ui->MessagesTable->currentRow();
if (ui->MessagesTable->item(thisRow, 0)->text().length() > 0) QTableWidgetItem* thisItem = ui->MessagesTable->item(thisRow, 0);
if (!thisItem) return;
if (thisItem->text().length() > 0)
{ {
ui->MessagesTable->removeRow(thisRow); ui->MessagesTable->removeRow(thisRow);
dbcFile->messageHandler->removeMessageByIndex(thisRow); dbcFile->messageHandler->removeMessageByIndex(thisRow);