From: Robin Gareus <robin@gareus.org>
Date: Thu, 1 Aug 2013 01:17:49 +0000 (+0200)
Subject: re-check meterbridge metric-area on route deletion
X-Git-Tag: 3.4~75
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=ad8ffab5440985c6ef26ff707d869bfe90daacaf;p=ardour.git

re-check meterbridge metric-area on route deletion

fixes http://tracker.ardour.org/view.php?id=5616#c15204
---

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index ede9cc2074..703870ecef 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -280,8 +280,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 MeterStrip::~MeterStrip ()
 {
-	delete level_meter;
-	CatchDeletion (this);
+	if (level_meter) {
+		delete level_meter;
+		CatchDeletion (this);
+	}
 }
 
 void
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index a0110365c1..4a4f1dd8dd 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -632,6 +632,8 @@ Meterbridge::remove_strip (MeterStrip* strip)
 			break;
 		}
 	}
+
+	resync_order();
 }
 
 void