From 39e887d6aa56b06fb57c6f8ff52aa39da24c11a7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 30 Apr 2006 20:35:43 +0000
Subject: Invoke updateSoundSettings a bit later, since it can only correctly
 set VAR_VOICE_MODE *after* setupScummVars() has been called

svn-id: r22247
---
 engines/scumm/scumm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ee7ea1af9c..1ffb9ae534 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -969,6 +969,8 @@ int ScummEngine::init() {
 	if (_game.version >= 5)
 		_sound->setupSound();
 
+	updateSoundSettings();
+
 	return 0;
 }
 
@@ -1470,8 +1472,6 @@ void ScummEngine::setupMusic(int midi) {
 				_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
 		}
 	}
-
-	updateSoundSettings();
 }
 
 void ScummEngine::updateSoundSettings() {
-- 
cgit v1.2.3