Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/src/lib/player.cc b/src/lib/player.cc
index bd33963a0234d0cb430c1106733a9d895914a4fc..00abc7190a823cd8ef080beb0b350f4f89dd25ca 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -566,7 +566,7 @@ Player::pass ()
        }
 
        optional<DCPTime> audio_fill_from;
-       if (_last_audio_time && !_playlist->audio_content_at(*_last_audio_time)) {
+       if (_last_audio_time) {
                /* Fill from the last audio or seek time */
                audio_fill_from = _last_audio_time;
        }