Prevent concurrent loop and punch recording (backend)

This also prevents switching between punch-in/out record
and looping without transport-stop.

1 files changed, 9 insertions, 0 deletions

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 8cdca5d79e..a79e39a4c2 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -145,6 +145,8 @@ Session::realtime_stop (bool abort, bool clear_state)
 
 	reset_slave_state ();
 
+	g_atomic_int_set (&_punch_or_loop, NoConstraint);
+
 	_transport_speed = 0;
 	_target_transport_speed = 0;
 	_engine_speed = 1.0;
@@ -604,6 +606,9 @@ Session::start_transport ()
 		break;
 	}
 
+	maybe_allow_only_loop ();
+	maybe_allow_only_punch ();
+
 	_transport_speed = _default_transport_speed;
 	_target_transport_speed = _transport_speed;
 
@@ -1575,6 +1580,10 @@ Session::set_play_loop (bool yn, bool change_transport_state)
 		return;
 	}
 
+	if (yn && !maybe_allow_only_loop (true)) {
+		return;
+	}
+
 	if (yn) {
 
 		play_loop = true;