[Scummvm-git-logs] scummvm master -> c8bdcfa24cd9878844f5f1bcf953369f6327aed5

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
c8bdcfa24c WAGE: Actually fix #16261


Commit: c8bdcfa24cd9878844f5f1bcf953369f6327aed5
    https://github.com/scummvm/scummvm/commit/c8bdcfa24cd9878844f5f1bcf953369f6327aed5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-10-23T20:26:30+02:00

Commit Message:
WAGE: Actually fix #16261

On a Swedish keyboard, you have to use the Alt Gr key to type "$". We
have to make sure that MacText::processEvent() lets these events through
to MacTextWindow::processEvent(), and that the latter does not exit
early.

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 35941d0710a..42925fe4e38 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1307,7 +1307,7 @@ bool MacText::processEvent(Common::Event &event) {
 				}
 				return true;
 			default:
-				break;
+				return false;
 			}
 		}
 
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index c8925ace3b0..975b4fe40a2 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -272,7 +272,8 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 		_wm->setActiveWindow(getId());
 
 		if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_CTRL | Common::KBD_META)) {
-			return _mactext->processEvent(event);
+			if (_mactext->processEvent(event))
+				return true;
 		}
 
 		switch (event.kbd.keycode) {