summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.cc
diff options
context:
space:
mode:
authorColin Fletcher <colin.m.fletcher@googlemail.com>2014-08-02 12:26:04 +0100
committerColin Fletcher <colin.m.fletcher@googlemail.com>2014-09-13 15:27:30 +0100
commitc3a5cd487ade4355b3bf2034c0c540409337bec5 (patch)
treecc536b66e7fe32f018e175bd62fd38caf7473425 /libs/ardour/session_transport.cc
parent017dcfea4588fcabf475ac6c1f3be258f98be8e7 (diff)
Return playhead to last start position when aborting capture
Diffstat (limited to 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc6
1 files changed, 5 insertions, 1 deletions
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;
}
}