From b34e314d25e184babf8c888095b852e8e8325369 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Wed, 29 Mar 2023 22:17:46 +0200
Subject: [PATCH] cabana: fix merging sources for already open DBC file
 (#27715)

* fix build

* fix merging sources
old-commit-hash: e0afaa4eeec1dd36ede1aea809d34637ef968385
---
 tools/cabana/dbc/dbcmanager.cc | 3 ++-
 tools/cabana/dbc/dbcmanager.h  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/cabana/dbc/dbcmanager.cc b/tools/cabana/dbc/dbcmanager.cc
index 0cc51989cd..49527765a8 100644
--- 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;
     }
diff --git a/tools/cabana/dbc/dbcmanager.h b/tools/cabana/dbc/dbcmanager.h
index 31183e8199..f9af96516c 100644
--- 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>