From c3a5cd487ade4355b3bf2034c0c540409337bec5 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Sat, 2 Aug 2014 12:26:04 +0100 Subject: [PATCH] Return playhead to last start position when aborting capture --- libs/ardour/session_transport.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 2cd8de49bf..dbf6af6f1e 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -558,7 +558,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) } bool const auto_return_enabled = - (!config.get_external_sync() && config.get_auto_return()); + (!config.get_external_sync() && (config.get_auto_return() || abort)); if (auto_return_enabled || (ptw & PostTransportLocate) || @@ -618,6 +618,10 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) _transport_frame = _last_roll_location; do_locate = true; } + } else if (abort) { + + _transport_frame = _last_roll_location; + do_locate = true; } }