X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=c9f9acd942179561184fb2c32bd70e2ee65a24b9;hp=96d23a82b38c3244cec08e01f68016d43f52f60c;hb=ad49361b303d1ceff7048fa0e89ba609ca9ce376;hpb=b2a9271256e09fcfedff3beea5fc73c04e7c0e14

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 96d23a82b..c9f9acd94 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -343,16 +343,16 @@ void
 Player::flush ()
 {
 	TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
-	if (tb.audio) {
+	if (_audio && tb.audio) {
 		Audio (tb.audio, tb.time);
 		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
 	}
 
-	while (_video_position < _audio_position) {
+	while (_video && _video_position < _audio_position) {
 		emit_black ();
 	}
 
-	while (_audio_position < _video_position) {
+	while (_audio && _audio_position < _video_position) {
 		emit_silence (_video_position - _audio_position);
 	}