From 5bb84a05683d23d4c3b8fb5631f47489b9b8f9b4 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 17 Apr 2023 18:53:04 +0200
Subject: [PATCH] cabana: remove msg on removing last signal (#27933)

old-commit-hash: d06936843b8759ce9b1e309620ef690ba99f2a28
---
 tools/cabana/signalview.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/cabana/signalview.cc b/tools/cabana/signalview.cc
index 4fb52839d5..76eecc13b8 100644
--- a/tools/cabana/signalview.cc
+++ b/tools/cabana/signalview.cc
@@ -248,6 +248,9 @@ void SignalModel::resizeSignal(const cabana::Signal *sig, int start_bit, int siz
 
 void SignalModel::removeSignal(const cabana::Signal *sig) {
   UndoStack::push(new RemoveSigCommand(msg_id, sig));
+  if (dbc()->signalCount(msg_id) == 0) {
+    UndoStack::push(new RemoveMsgCommand(msg_id));
+  }
 }
 
 void SignalModel::handleMsgChanged(MessageId id) {