From 9db76f951b49805600adea96cc44bee0bec892a2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 28 Jun 2021 14:08:50 -0600 Subject: [PATCH] do not ask for locate-to-loop start in GUI toggle roll This may have implications for similar code in control surface support --- gtk2_ardour/ardour_ui.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 6dec1c60f5..13c0ab8477 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1903,9 +1903,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) return; } - if (_session->get_play_loop() && Config->get_loop_is_mode()) { - _session->request_locate (_session->locations()->auto_loop_location()->start(), MustRoll); - } else { + if (!_session->get_play_loop() && !Config->get_loop_is_mode()) { if (UIConfiguration::instance().get_follow_edits()) { list& range = editor->get_selection().time; if (range.front().start == _session->transport_sample()) { // if playhead is exactly at the start of a range, we assume it was placed there by follow_edits @@ -1913,8 +1911,8 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) _session->set_requested_return_sample (range.front().start); //force an auto-return here } } - _session->request_roll (); } + _session->request_roll (); } }