[Scummvm-git-logs] scummvm master -> 36239d02e41487f2d6f2bcf01ec13a08c2336f15

[eriktorbjorn]

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:
36239d02e4 SWORD2: Disable "engine-default" keymapper during save dialog


Commit: 36239d02e41487f2d6f2bcf01ec13a08c2336f15
    https://github.com/scummvm/scummvm/commit/36239d02e41487f2d6f2bcf01ec13a08c2336f15
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-10-29T21:24:31+01:00

Commit Message:
SWORD2: Disable "engine-default" keymapper during save dialog

Changed paths:
    engines/sword2/controls.cpp


diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index 36085deea87..84ff6a81810 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -21,10 +21,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "common/rect.h"
 #include "common/system.h"
 
+#include "backends/keymapper/keymapper.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/header.h"
@@ -1408,8 +1409,17 @@ void SaveRestoreDialog::setResult(int result) {
 }
 
 int SaveRestoreDialog::runModal() {
+	Common::Keymapper *keymapper = _vm->_system->getEventManager()->getKeymapper();
+	Common::Keymap *engineDefault = keymapper->getKeymap("engine-default");
+
+	if (_mode == kSaveDialog)
+		engineDefault->setEnabled(false);
+
 	int result = Dialog::runModal();
 
+	if (_mode == kSaveDialog)
+		engineDefault->setEnabled(true);
+
 	if (result) {
 		switch (_mode) {
 		case kSaveDialog: