summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-08-01 03:17:49 +0200
committerRobin Gareus <robin@gareus.org>2013-08-01 03:17:49 +0200
commitad8ffab5440985c6ef26ff707d869bfe90daacaf (patch)
treef2030eb40e0bcd5234d58e28096a1652497fffd4 /gtk2_ardour
parent4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff)
re-check meterbridge metric-area on route deletion
fixes http://tracker.ardour.org/view.php?id=5616#c15204
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/meter_strip.cc6
-rw-r--r--gtk2_ardour/meterbridge.cc2
2 files changed, 6 insertions, 2 deletions
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