From 0a4b9ffba541bfe62fcf949c634b627e1a5881c4 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 19 Sep 2017 21:38:34 -0400
Subject: [PATCH] do not advance DiskReader's idea of playback_sample while
 waiting for _roll_delay to expire

---
 libs/ardour/disk_reader.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index d14bd18971..8f53cf805d 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -458,7 +458,7 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
 		}
 	}
 
-	if (!still_locating) {
+	if (!still_locating && !roll_delayed) {
 
 		bool butler_required = false;