summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.cc
diff options
context:
space:
mode:
authorAlex Pilon <alex.pilon@gmail.com>2018-12-27 16:26:01 -0500
committerRobin Gareus <robin@gareus.org>2018-12-28 17:30:09 +0100
commit53c6b7f909d021e72f02c8e880a75b7d42ec5b81 (patch)
tree61c71242883633f61d75be96eef4ea8658b21f30 /libs/ardour/session_transport.cc
parente7091cb2cdf23e08d10b505bcb17d43ec0b4913b (diff)
Check whether punch-in is enabled and record is enabled in addition to if we are actively recording when deciding whether to run count-in clicks
Diffstat (limited to 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 49354dad60..425e640915 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1625,7 +1625,7 @@ Session::start_transport ()
send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
}
- if (actively_recording() && click_data && (config.get_count_in () || _count_in_once)) {
+ if ((actively_recording() || (config.get_punch_in() && get_record_enabled())) && click_data && (config.get_count_in () || _count_in_once)) {
_count_in_once = false;
/* calculate count-in duration (in audio samples)
* - use [fixed] tempo/meter at _transport_sample