From 4c03ecbd854b7008f0ffde702a1a4384e2d3e6af Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 12 Jun 2025 17:45:09 +0200
Subject: [PATCH] Handle edge case (optional toolbar meter)

in derivative projects it can happen that the meter is never
packaged in the custom toolbar. In Ardour this can happen
for sessions without master bus.
---
 gtk2_ardour/application_bar.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/application_bar.cc b/gtk2_ardour/application_bar.cc
index 4602d54507..f489858f15 100644
--- a/gtk2_ardour/application_bar.cc
+++ b/gtk2_ardour/application_bar.cc
@@ -805,7 +805,10 @@ ApplicationBar::set_session (Session *s)
 		_transport_hbox.remove (_editor_meter_table);
 	}
 	if (_editor_meter) {
-		_editor_meter_table.remove(*_editor_meter);
+		Gtk::Container *parent = _editor_meter->get_parent();
+		if (parent) {
+			parent->remove(*_editor_meter);
+		}
 		delete _editor_meter;
 		_editor_meter = 0;
 	}