From adf8820aee35ce2fa38b5420aab50461653f705f Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 20 Jan 2011 15:29:32 +0000
Subject: GOB: Make blocking videos default

svn-id: r55354
---
 engines/gob/inter_v6.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index c04f34d894..5f93f9af26 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -169,7 +169,7 @@ void Inter_v6::o6_playVmdOrMusic() {
 		close = false;
 	}
 
-	_vm->_vidPlayer->evaluateFlags(props);
+	_vm->_vidPlayer->evaluateFlags(props, true);
 
 	int slot = 0;
 	if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(true, fileName, props)) < 0)) {
@@ -177,11 +177,6 @@ void Inter_v6::o6_playVmdOrMusic() {
 		return;
 	}
 
-	if(!(props.flags & 0x1000) && !(props.flags & VideoPlayer::kFlagNoVideo))
-		props.flags |= VideoPlayer::kFlagNonBlocking;
-	else
-		props.flags &= ~0x1000;
-
 	if (props.startFrame >= 0)
 		_vm->_vidPlayer->play(slot, props);
 
-- 
cgit v1.2.3