From 53ddd200e79ff3dfe9ed403b28f37d24ccfb446c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 25 May 2024 06:06:22 -0600 Subject: [PATCH] fix crashes related to loop/punch ruler no longer existing --- gtk2_ardour/ardour_ui_options.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 63d65add05..a3e78f8126 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -246,7 +246,12 @@ ARDOUR_UI::toggle_punch_out () void ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide () { -/* XXX FIX ME */ + return; + + /* This is what this method used to do but after ruler consolidation + * it is not clear what the correct semantics are/should be. + */ + Glib::RefPtr tact; // = ActionManager::get_toggle_action (X_("Rulers"), "toggle-loop-punch-ruler"); tact->set_sensitive (false); @@ -260,7 +265,12 @@ ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide () void ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate () { -/* XXX FIX ME */ + return; + + /* This is what this method used to do but after ruler consolidation + * it is not clear what the correct semantics are/should be. + */ + if (!_session->config.get_punch_in() && !_session->config.get_punch_out()) { /* if punch in/out are now both off, reallow hiding of the loop/punch ruler */ Glib::RefPtr act; // = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");