sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix build

* fix merging sources
pull/27736/head
Willem Melching 2 years ago committed by GitHub
parent d6961152b8
commit e0afaa4eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      tools/cabana/dbc/dbcmanager.cc
  2. 2
      tools/cabana/dbc/dbcmanager.h

3
tools/cabana/dbc/dbcmanager.cc
Unescape View File

@ -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 // Check if file is already open, and merge sources
if (dbc_file->filename == dbc_file_name) { if (dbc_file->filename == dbc_file_name) {
ss |= s; dbc_files[i] = {ss | s, dbc_file};
emit DBCFileChanged(); emit DBCFileChanged();
return true; return true;
} }

2
tools/cabana/dbc/dbcmanager.h
Unescape View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <map> #include <map>
#include <optional>
#include <QList> #include <QList>
#include <QMetaType> #include <QMetaType>
#include <QObject> #include <QObject>

Write Preview
Loading…
Cancel
Save