diff options
author | Robin Gareus <robin@gareus.org> | 2019-03-07 16:42:04 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-03-07 23:50:43 +0100 |
commit | 64e1d691ecc54c33c34adb13a66f51790c9bc0d9 (patch) | |
tree | 7ea3c0fb755f3dc33abf94b0f3baf0cb803752f1 /gtk2_ardour/mixer_strip.cc | |
parent | 3bc9281c312ec237b6365c023c5ef060f5788a6b (diff) |
Prefer using RAII to suspend signals
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 68e4ab8e5c..736e757675 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -28,6 +28,7 @@ #include "pbd/enumwriter.h" #include "pbd/replace_all.h" #include "pbd/stacktrace.h" +#include "pbd/unwind.h" #include "ardour/amp.h" #include "ardour/audio_track.h" @@ -2524,7 +2525,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) RadioMenuItem::Group group; - _suspend_menu_callbacks = true; + PBD::Unwinder<bool> (_suspend_menu_callbacks, true); add_level_meter_item_point (items, group, _("Input"), MeterInput); add_level_meter_item_point (items, group, _("Pre Fader"), MeterPreFader); add_level_meter_item_point (items, group, _("Post Fader"), MeterPostFader); @@ -2533,7 +2534,6 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) if (gpm.meter_channels().n_audio() == 0) { m->popup (ev->button, ev->time); - _suspend_menu_callbacks = false; return; } @@ -2580,7 +2580,6 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) sigc::bind (SetMeterTypeMulti, _strip_type, _route->route_group(), cmt))); m->popup (ev->button, ev->time); - _suspend_menu_callbacks = false; } void |