cabana: fix merging sources for already open DBC file (#27715)

* fix build * fix merging sources old-commit-hash: e0afaa4eee
2 years ago · b34e314d25
parent 9897bc83c4
commit b34e314d25
2 changed files with 4 additions and 1 deletions
--- a/tools/cabana/dbc/dbcmanager.cc
+++ b/tools/cabana/dbc/dbcmanager.cc
@ -14,7 +14,8 @@ bool DBCManager::open(SourceSet s, const QString &dbc_file_name, QString *error)

    // Check if file is already open, and merge sources
    if (dbc_file->filename == dbc_file_name) {
-      ss |= s;
+      dbc_files[i] = {ss | s, dbc_file};
+
      emit DBCFileChanged();
      return true;
    }
--- a/tools/cabana/dbc/dbcmanager.h
+++ b/tools/cabana/dbc/dbcmanager.h
@ -1,6 +1,8 @@
 #pragma once

 #include <map>
+#include <optional>
+
 #include <QList>
 #include <QMetaType>
 #include <QObject>