don't attempt MIDI playback if there are no MIDI buffers provided for processing

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 871c30df26b9c94bc09cd4f6a34ffc21b3e9cf96..207978f733f7ea9a8d2a95c752216956e2fb2458 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -391,7 +391,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
 
        /* MIDI data handling */
 
-       if (!_session.declick_out_pending()) {
+       if (!_session.declick_out_pending() && bufs.count().n_midi()) {
                MidiBuffer* dst;
 
                if (_no_disk_output) {
@@ -400,7 +400,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
                        dst = &bufs.get_midi (0);
                }
 
-               if (ms & MonitoringDisk && !still_locating) {
+               if ((ms & MonitoringDisk) && !still_locating) {
                        get_midi_playback (*dst, disk_samples_to_consume, ms, scratch_bufs, speed, disk_samples_to_consume);
                }
        }