re-check meterbridge metric-area on route deletion
authorRobin Gareus <robin@gareus.org>
Thu, 1 Aug 2013 01:17:49 +0000 (03:17 +0200)
committerRobin Gareus <robin@gareus.org>
Thu, 1 Aug 2013 01:17:49 +0000 (03:17 +0200)
fixes http://tracker.ardour.org/view.php?id=5616#c15204

gtk2_ardour/meter_strip.cc
gtk2_ardour/meterbridge.cc

index ede9cc2074f6503ca358af53fd301510c4e427a3..703870ecefef2770dcda03bd3f0c61813654ee61 100644 (file)
@@ -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
index a0110365c18584a2de2dbe0543eb1447ab1ff88d..4a4f1dd8dd3a81ad3023c1d31db7d13eb7822560 100644 (file)
@@ -632,6 +632,8 @@ Meterbridge::remove_strip (MeterStrip* strip)
                        break;
                }
        }
+
+       resync_order();
 }
 
 void