add another conditional to decide if we should merge disk MIDI data into input MIDI data

This commit is contained in:
Paul Davis 2019-10-29 21:19:54 -06:00
parent 1a2820a886
commit 4d5fd1af4b

View file

@ -1153,7 +1153,7 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, sample
}
if (!_no_disk_output && (ms & MonitoringInput)) {
if (!pending_overwrite() && !_no_disk_output && (ms & MonitoringInput)) {
dst.merge_from (*target, nframes);
}