diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-17 13:10:42 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-17 13:10:42 +0000 |
commit | a5e74a774c6e1b39672392e26ee48385c4ac0034 (patch) | |
tree | adabcf01a62a93c8d09f81daf91935b1e0a3c5cb /libs/ardour/midi_diskstream.cc | |
parent | 6ad57df62b5edaaa09fcc604358861ce82e64342 (diff) |
forward port 2.X changes up to and including rev 6909
git-svn-id: svn://localhost/ardour2/branches/3.0@7639 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
-rw-r--r-- | libs/ardour/midi_diskstream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 3151869fc3..9b8077774d 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -514,7 +514,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_ adjust_capture_position = 0; - if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) { + if (nominally_recording || (re && was_recording && _session.get_record_enabled() && _session.config.get_punch_in())) { OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset); |