[Scummvm-cvs-logs] scummvm master -> 6fd5f650bcad149d7352e5a1406eef8f5ea8397a

[lordhoto]

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:
6fd5f650bc KYRA: Allow user to cancel saving in EoB via ESC.


Commit: 6fd5f650bcad149d7352e5a1406eef8f5ea8397a
    https://github.com/scummvm/scummvm/commit/6fd5f650bcad149d7352e5a1406eef8f5ea8397a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-30T09:10:51-08:00

Commit Message:
KYRA: Allow user to cancel saving in EoB via ESC.

Changed paths:
    engines/kyra/gui_eob.cpp



diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 4f241e7..1c827e2 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2705,11 +2705,20 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 			for (int in = -1; in == -1 && !_vm->shouldQuit();) {
 				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->guiSettings()->colors.fill);
 				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
+				if (in == -1) {
+					useSlot = false;
+					break;
+				}
+
 				if (!strlen(_saveSlotStringsTemp[slot])) {
 					messageDialogue(11, 54, 6);
 					in = -1;
 				}
-			};
+			}
+
+			if (!useSlot) {
+				continue;
+			}
 
 			_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->guiSettings()->colors.fill);
 			_screen->printShadedText(_saveSlotStringsTemp[slot], (x + 1) << 3, fy, 15, 0);