[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.207,1.208

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25636

Modified Files:
	saveload.cpp 
Log Message:
Call setupVolumes in a more appropriate part of the save/load code

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- saveload.cpp	26 Apr 2005 13:16:18 -0000	1.207
+++ saveload.cpp	26 Apr 2005 13:22:46 -0000	1.208
@@ -183,6 +183,9 @@
 	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 @@
 
 	// This is probably only needed for Loom.
 	saveOrLoadCursorImages(s);
-
-	if (s->isLoading())
-		setupVolumes();
 }
 
 void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {