From 9421c2a9b9eea44dcc7ac8d7cc1170ebc20f0e45 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 26 Apr 2005 13:22:46 +0000
Subject: Call setupVolumes in a more appropriate part of the save/load code

svn-id: r17817
---
 scumm/saveload.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm/saveload.cpp')

diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 267758d52f..4ffbf7faf7 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -183,6 +183,9 @@ bool ScummEngine::loadState(int slot, bool compat) {
 	saveOrLoad(&ser, hdr.ver);
 	delete in;
 	
+	// Update volume settings
+	setupVolumes();
+
 	// Normally, _vm->_screenTop should always be >= 0, but for some old save games
 	// it is not, hence we check & correct it here.
 	if (_screenTop < 0)
@@ -913,9 +916,6 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 
 	// This is probably only needed for Loom.
 	saveOrLoadCursorImages(s);
-
-	if (s->isLoading())
-		setupVolumes();
 }
 
 void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
-- 
cgit v1.2.3