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

[Strangerke]

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:
f51eaed595 TSAGE: Fix 'Restart' button, when game is over


Commit: f51eaed5952ecb53ce9c780d05f04eb94e64b7e4
    https://github.com/scummvm/scummvm/commit/f51eaed5952ecb53ce9c780d05f04eb94e64b7e4
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-28T00:37:08-07:00

Commit Message:
TSAGE: Fix 'Restart' button, when game is over

Changed paths:
    engines/tsage/ringworld_logic.cpp



diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 3f68e46..95c9da9 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -1413,7 +1413,10 @@ void RingworldGame::endGame(int resNum, int lineNum) {
 		// Savegames exist, so prompt for Restore/Restart
 		bool breakFlag;
 		do {
-			if (MessageDialog::show(msg, RESTART_BTN_STRING, RESTORE_BTN_STRING) == 0 || _vm->shouldQuit()) {
+			if (_vm->shouldQuit()) {
+				breakFlag = true;
+			} else if (MessageDialog::show(msg, RESTART_BTN_STRING, RESTORE_BTN_STRING) == 0) {
+				restart();
 				breakFlag = true;
 			} else {
 				handleSaveLoad(false, _globals->_sceneHandler._loadGameSlot, _globals->_sceneHandler._saveName);