Return playhead to last start position when aborting capture

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 2cd8de49bfda2354514c4eee0b2597e701582fa6..dbf6af6f1ee814c3bc4fee40389947a68b09fbd2 100644 (file)
--- 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;
                                }
                        }