cabana: fix multiple dialog popups (#28358)

fix multiple popups
old-commit-hash: a19799cbe9
beeps
Dean Lee 2 years ago committed by GitHub
parent 2bfd6317f3
commit c0883bcabe
  1. 11
      tools/cabana/mainwin.cc
  2. 1
      tools/cabana/mainwin.h

@ -351,12 +351,13 @@ void MainWindow::streamStarted() {
} }
void MainWindow::eventsMerged() { void MainWindow::eventsMerged() {
if (!can->liveStreaming()) { if (!can->liveStreaming() && std::exchange(car_fingerprint, can->carFingerprint()) != car_fingerprint) {
auto fingerprint = can->carFingerprint(); video_dock->setWindowTitle(tr("ROUTE: %1 FINGERPRINT: %2")
video_dock->setWindowTitle(tr("ROUTE: %1 FINGERPRINT: %2").arg(can->routeName()).arg(fingerprint.isEmpty() ? tr("Unknown Car") : fingerprint)); .arg(can->routeName())
.arg(car_fingerprint.isEmpty() ? tr("Unknown Car") : car_fingerprint));
// Don't overwrite already loaded DBC // Don't overwrite already loaded DBC
if (!dbc()->msgCount() && !fingerprint.isEmpty()) { if (!dbc()->msgCount() && !car_fingerprint.isEmpty()) {
auto dbc_name = fingerprint_to_dbc[fingerprint]; auto dbc_name = fingerprint_to_dbc[car_fingerprint];
if (dbc_name != QJsonValue::Undefined) { if (dbc_name != QJsonValue::Undefined) {
loadDBCFromOpendbc(dbc_name.toString()); loadDBCFromOpendbc(dbc_name.toString());
} }

@ -95,6 +95,7 @@ protected:
QAction *save_dbc = nullptr; QAction *save_dbc = nullptr;
QAction *save_dbc_as = nullptr; QAction *save_dbc_as = nullptr;
QAction *copy_dbc_to_clipboard = nullptr; QAction *copy_dbc_to_clipboard = nullptr;
QString car_fingerprint;
int prev_undostack_index = 0; int prev_undostack_index = 0;
int prev_undostack_count = 0; int prev_undostack_count = 0;
friend class OnlineHelp; friend class OnlineHelp;

Loading…
Cancel
Save