From 843907654c8bb694d58e6efb1d313c735eb4ec4d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 10 Mar 2020 09:16:31 -0600 Subject: [PATCH] do not reset default transport speed when stopping to prepare for a locate --- libs/ardour/session_transport.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index b8e2431aff..db3469b93f 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -99,8 +99,14 @@ Session::realtime_stop (bool abort, bool clear_state) DEBUG_TRACE (DEBUG::Transport, string_compose ("realtime stop @ %1 speed = %2\n", _transport_sample, _transport_speed)); PostTransportWork todo = PostTransportStop; - /* this resets the speed we will start at if just requested to roll again */ - _default_transport_speed = 1.0; + /* this resets the speed we will start at if just requested to roll + * again. Don't do it if we are stopping to locate ... in those + * conditions, keep the current default speed so that when we start + * again we resume that speed + */ + if (!_transport_fsm->declicking_for_locate()) { + _default_transport_speed = 1.0; + } /* call routes */