diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index a29a64428c..40eab9b979 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -1130,7 +1130,7 @@ TriggerBoxUI::drag_data_received (Glib::RefPtr const& context, TriggerBoxWidget::TriggerBoxWidget (TriggerStrip& s, float w, float h) : FittedCanvasWidget (w, h) - , ui (nullptr) + , _ui (nullptr) , _strip (s) { use_intermediate_surface (false); @@ -1140,16 +1140,16 @@ TriggerBoxWidget::TriggerBoxWidget (TriggerStrip& s, float w, float h) void TriggerBoxWidget::set_triggerbox (TriggerBox* tb) { - if (ui) { - root ()->remove (ui); - delete ui; - ui = nullptr; + if (_ui) { + root ()->remove (_ui); + delete _ui; + _ui = nullptr; } if (!tb) { return; } - ui = new TriggerBoxUI (root (), _strip, *tb); + _ui = new TriggerBoxUI (root (), _strip, *tb); repeat_size_allocation (); } diff --git a/gtk2_ardour/triggerbox_ui.h b/gtk2_ardour/triggerbox_ui.h index e34d3d3b95..d7cd4b6091 100644 --- a/gtk2_ardour/triggerbox_ui.h +++ b/gtk2_ardour/triggerbox_ui.h @@ -161,9 +161,9 @@ public: void set_triggerbox (ARDOUR::TriggerBox* tb); TriggerStrip& strip() const { return _strip; } - + TriggerBoxUI* ui() const { return _ui; } private: - TriggerBoxUI* ui; + TriggerBoxUI* _ui; TriggerStrip& _strip; };