diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-01 10:44:58 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-01 10:44:58 -0400 |
| commit | bb8cb93789b2eec65e4d82e5ceb64054673cbc4f (patch) | |
| tree | 4de0ce7d4960f35d540a3e1da4c99f1e0661991c /gtk2_ardour | |
| parent | 6a436fd826d1c9d88b60287696cc0836ccce35aa (diff) | |
| parent | 6a181038009ce0e6152af55645424a8582c34c78 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/meterbridge.cc | 2 |
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 |