summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-09-22 13:20:52 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-09-28 17:42:11 -0400
commitc9b991ba50c54d5d844386f028e6119114a051b3 (patch)
tree03460e217071ef7366fa9685a63973d4ad0bb120
parentf2aa6819747514ed74e3027824e7eddc2419c1f5 (diff)
move code location where loop playback is cancelled when stopping
-rw-r--r--libs/ardour/session_transport.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index f531a919e3..7341e3932d 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -283,6 +283,10 @@ Session::realtime_stop (bool abort, bool clear_state)
/* if we're going to clear loop state, then force disabling record BUT only if we're not doing latched rec-enable */
disable_record (true, (!Config->get_latched_record_enable() && clear_state));
+ if (clear_state && !Config->get_loop_is_mode()) {
+ unset_play_loop ();
+ }
+
reset_slave_state ();
_transport_speed = 0;
@@ -1299,10 +1303,6 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
stop_transport (abort);
}
- if (!Config->get_loop_is_mode()) {
- unset_play_loop ();
- }
-
} else if (transport_stopped() && speed == 1.0) {
/* we are stopped and we want to start rolling at speed 1 */