From 00cabdad11ea7b2bac21eb0e06aa99d325be31b5 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 22 Jan 2011 19:37:25 +0000
Subject: GOB: Only let one video with sound play at a time

svn-id: r55444
---
 engines/gob/inter_v6.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/gob/inter_v6.cpp')

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 8e74ed42f1..a9262d7c37 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -175,10 +175,8 @@ void Inter_v6::o6_playVmdOrMusic() {
 	_vm->_vidPlayer->evaluateFlags(props);
 
 	bool primary = true;
-	if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo)) {
-		_vm->_vidPlayer->closeLiveSound();
+	if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo))
 		primary = false;
-	}
 
 	int slot = 0;
 	if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(primary, fileName, props)) < 0)) {
@@ -186,6 +184,9 @@ void Inter_v6::o6_playVmdOrMusic() {
 		return;
 	}
 
+	if (props.hasSound)
+		_vm->_vidPlayer->closeLiveSound();
+
 	if (props.startFrame >= 0)
 		_vm->_vidPlayer->play(slot, props);
 
-- 
cgit v1.2.3