[Scummvm-cvs-logs] scummvm master -> dc93093afac824dc4407ac969bb5af775b84e5b1

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dc93093afa SCI: Fix a small glitch when loading (regression)


Commit: dc93093afac824dc4407ac969bb5af775b84e5b1
    https://github.com/scummvm/scummvm/commit/dc93093afac824dc4407ac969bb5af775b84e5b1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2012-12-02T16:11:34-08:00

Commit Message:
SCI: Fix a small glitch when loading (regression)

This is caused by commit ed6bc0a13dea0abee56182bc9ff0cd616942fd65,
and caused players to click an extra time when trying to change the
game audio options after loading a game

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 2fa992e..1f5c354 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -683,8 +683,9 @@ void SciEngine::runGame() {
 	if (DebugMan.isDebugChannelEnabled(kDebugLevelOnStartup))
 		_console->attach();
 
+	_gamestate->_syncedAudioOptions = false;
+
 	do {
-		_gamestate->_syncedAudioOptions = false;
 		_gamestate->_executionStackPosChanged = false;
 		run_vm(_gamestate);
 		exitGame();
@@ -702,6 +703,7 @@ void SciEngine::runGame() {
 			if (_gfxMenu)
 				_gfxMenu->reset();
 			_gamestate->abortScriptProcessing = kAbortNone;
+			_gamestate->_syncedAudioOptions = false;
 		} else if (_gamestate->abortScriptProcessing == kAbortLoadGame) {
 			_gamestate->abortScriptProcessing = kAbortNone;
 			_gamestate->_executionStack.clear();
@@ -713,6 +715,7 @@ void SciEngine::runGame() {
 
 			syncSoundSettings();
 			syncIngameAudioOptions();
+			// Games do not set their audio settings when loading
 		} else {
 			break;	// exit loop
 		}