[Scummvm-git-logs] scummvm master -> 7798de5bc60f267d71d8ac85e626326b1bdd157c

[dreammaster]

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:
7798de5bc6 XEEN: Fix opening Other Options menu after canceling loading a save


Commit: 7798de5bc60f267d71d8ac85e626326b1bdd157c
    https://github.com/scummvm/scummvm/commit/7798de5bc60f267d71d8ac85e626326b1bdd157c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-29T13:20:47-04:00

Commit Message:
XEEN: Fix opening Other Options menu after canceling loading a save

Changed paths:
    engines/xeen/worldofxeen/worldofxeen_menu.cpp


diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index 81cb7f1..7af017f 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -258,6 +258,7 @@ void WorldOfXeenCDMainMenuContainer::showMenuDialog() {
 /*------------------------------------------------------------------------*/
 
 bool MainMenuDialog::handleEvents() {
+	FileManager &files = *g_vm->_files;
 	checkEvents(g_vm);
 	int difficulty;
 
@@ -274,14 +275,18 @@ bool MainMenuDialog::handleEvents() {
 		g_vm->_gameMode = GMODE_PLAY_GAME;
 		break;
 
-	case Common::KEYCODE_l:
+	case Common::KEYCODE_l: {
 		// Load existing game
+		int ccNum = files._ccNum;
 		g_vm->_saves->newGame();
-		if (!g_vm->_saves->loadGame())
+		if (!g_vm->_saves->loadGame()) {
+			files.setGameCc(ccNum);
 			return true;
+		}
 
 		g_vm->_gameMode = GMODE_PLAY_GAME;
 		break;
+	}
 
 	case Common::KEYCODE_c:
 	case Common::KEYCODE_v: