From 52f88f68145fb07a9f30eacbb5d2ea7f08a5ccde Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 20 Feb 2020 01:17:23 +0100 Subject: [PATCH] Fix crash on buffer override of N/A data-types DiskReader::refill_audio and DR::run() do check if a given playlist is available. This is required for upcoming changes to set DR channels to unconditionally match DiskWriter. --- libs/ardour/disk_reader.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 00cc9163b2..ac07f23306 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -717,13 +717,13 @@ DiskReader::overwrite_existing_buffers () bool ret = true; if (g_atomic_int_get (&_pending_overwrite) & (PlaylistModified|LoopDisabled|LoopChanged|PlaylistChanged)) { - if (!overwrite_existing_audio ()) { + if (_playlists[DataType::AUDIO] && !overwrite_existing_audio ()) { ret = false; } } if (g_atomic_int_get (&_pending_overwrite) & (PlaylistModified|PlaylistChanged)) { - if (!overwrite_existing_midi ()) { + if (_playlists[DataType::MIDI] && !overwrite_existing_midi ()) { ret = false; } }