From da7a721494ab474abc17d7a438e470faeedbbfde Mon Sep 17 00:00:00 2001 From: Andy Huska Date: Tue, 20 Sep 2022 16:27:53 -0500 Subject: [PATCH] Changed default signalviewer message matching to be by ID --- signalviewerwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/signalviewerwindow.cpp b/signalviewerwindow.cpp index 6346168..2835699 100644 --- a/signalviewerwindow.cpp +++ b/signalviewerwindow.cpp @@ -283,14 +283,15 @@ void SignalViewerWindow::loadDefinitions(bool append) QString msgName = QString(tokens[2]); QString sigName = QString(tokens[3]); DBC_MESSAGE *msg;; - if (msg = dbcHandler->findMessage(msgName)) + if(msg = dbcHandler->findMessage(msgId)) { sig = msg->sigHandler->findSignalByName(sigName); if(sig) loadedSignals.append(sig); } - else if(msg = dbcHandler->findMessage(msgId)) + else if (msg = dbcHandler->findMessage(msgName)) { + //this is not a very safe way to match since messages names can be duplicated sig = msg->sigHandler->findSignalByName(sigName); if(sig) loadedSignals.append(sig);