[Scummvm-git-logs] scummvm branch-2-5 -> 961015ea727d2329603e07cfc8596634079ccdf4

[athrxx]

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:
961015ea72 KYRA: (LOL) - fix keymap not getting re-enabled after a save


Commit: 961015ea727d2329603e07cfc8596634079ccdf4
    https://github.com/scummvm/scummvm/commit/961015ea727d2329603e07cfc8596634079ccdf4
Author: Benoit Pierre (benoit.pierre at gmail.com)
Date: 2021-10-24T03:44:45+02:00

Commit Message:
KYRA: (LOL) - fix keymap not getting re-enabled after a save

Changed paths:
    engines/kyra/gui/gui_lol.cpp


diff --git a/engines/kyra/gui/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp
index 08fafc961f..6f1c3a1959 100644
--- a/engines/kyra/gui/gui_lol.cpp
+++ b/engines/kyra/gui/gui_lol.cpp
@@ -2403,9 +2403,6 @@ int GUI_LoL::runMenu(Menu &menu) {
 
 			// Disable keyboard keymap during text input (save menu)
 			lolKeyboardKeymap->setEnabled(false);
-		} else if (_lastMenu == &_savenameMenu) {
-			// Restore keyboard keymap after text input (save menu)
-			lolKeyboardKeymap->setEnabled(true);
 		}
 
 		while (!_newMenu && _displayMenu) {
@@ -2450,8 +2447,13 @@ int GUI_LoL::runMenu(Menu &menu) {
 				_displayMenu = false;
 		}
 
-		if (_newMenu != _currentMenu || !_displayMenu)
+		if (_newMenu != _currentMenu || !_displayMenu) {
+			if (_currentMenu == &_savenameMenu) {
+				// Restore keyboard keymap after text input (save menu)
+				lolKeyboardKeymap->setEnabled(true);
+			}
 			restorePage0();
+		}
 
 		_currentMenu->highlightedItem = hasSpecialButtons;