[Scummvm-cvs-logs] scummvm master -> 5b1631960e1c10e8fe60261eee0cec62756e3d66

[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:
5b1631960e SCI: Fix bug #6536 - "SCI: JONES - top menu empty after loading from launcher"


Commit: 5b1631960e1c10e8fe60261eee0cec62756e3d66
    https://github.com/scummvm/scummvm/commit/5b1631960e1c10e8fe60261eee0cec62756e3d66
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-02-16T17:29:54-08:00

Commit Message:
SCI: Fix bug #6536 - "SCI: JONES - top menu empty after loading from launcher"

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f32e0e1..fdc016b 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -286,6 +286,11 @@ Common::Error SciEngine::run() {
 		// We set this, so that the game automatically quit right after init
 		_gamestate->variables[VAR_GLOBAL][4] = TRUE_REG;
 
+		// Jones only initializes its menus when restarting/restoring, thus set
+		// the gameIsRestarting flag here before initializing. Fixes bug #6536.
+		if (g_sci->getGameId() == GID_JONES)
+			_gamestate->gameIsRestarting = GAMEISRESTARTING_RESTORE;
+
 		_gamestate->_executionStackPosChanged = false;
 		run_vm(_gamestate);