From 7478dcb6bac871d7839dad9923cdb2d06cd12790 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 30 Dec 2013 23:52:56 +0000
Subject: Don't flush audio if Player is not supposed to be playing it.

---
 src/lib/player.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 09a437494..cacb42651 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -375,16 +375,16 @@ void
 Player::flush ()
 {
 	TimedAudioBuffers<Time> 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 (_film->time_to_audio_frames (_video_position - _audio_position));
 	}
 	
-- 
cgit v1.2.3