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

[dreammaster]

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:
ccf6feaed5 BAGEL: MFC: Fix using Enter key to close info dialogs


Commit: ccf6feaed5e3f407cdc2ad77c8a71b3aec0aa9b9
    https://github.com/scummvm/scummvm/commit/ccf6feaed5e3f407cdc2ad77c8a71b3aec0aa9b9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-03T17:18:43+11:00

Commit Message:
BAGEL: MFC: Fix using Enter key to close info dialogs

Changed paths:
    NEWS.md
    engines/bagel/metaengine.cpp
    engines/bagel/mfc/dialog.cpp


diff --git a/NEWS.md b/NEWS.md
index 3679e947d72..57ee1e8a663 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -14,6 +14,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Bagel:
    - Fix Enter/Escape keys in The Guessing Game guess dialog
+   - Fix using Enter key to close info dialogs
 
  MM:
    - Fixed M&M1 memory corruption on exit.
diff --git a/engines/bagel/metaengine.cpp b/engines/bagel/metaengine.cpp
index e61d57840b9..fdaa6a8f63e 100644
--- a/engines/bagel/metaengine.cpp
+++ b/engines/bagel/metaengine.cpp
@@ -61,7 +61,7 @@ static const KeybindingRecord MINIMAL_KEYS[] = {
 };
 
 static const KeybindingRecord NORMAL_KEYS[] = {
-	{ KEYBIND_SELECT, "SELECT", _s("Select"), "SPACE", "RETURN", "JOY_A" },
+	{ KEYBIND_SELECT, "SELECT", _s("Select"), "SPACE", nullptr, "JOY_A" },
 	{ KEYBIND_ESCAPE, "ESCAPE", _s("Escape"), "ESCAPE", nullptr, "JOY_B" },
 	{ KEYBIND_UP, "UP", _s("Up"), "UP", nullptr, "JOY_UP"},
 	{ KEYBIND_DOWN, "DOWN", _s("Down"), "DOWN", nullptr, "JOY_DOWN"},
diff --git a/engines/bagel/mfc/dialog.cpp b/engines/bagel/mfc/dialog.cpp
index 1dd115b8a9f..a974e6b3613 100644
--- a/engines/bagel/mfc/dialog.cpp
+++ b/engines/bagel/mfc/dialog.cpp
@@ -367,9 +367,12 @@ bool CDialog::IsDialogMessage(LPMSG lpMsg) {
 }
 
 bool CDialog::handleEnterKey(LPMSG lpMsg) {
+	// Check for a focused control. We can close immediately if there isn't
 	HWND hFocus = GetFocus();
-	if (!hFocus)
-		return false;
+	if (!hFocus) {
+		OnOK();
+		return true;
+	}
 
 	// Ask control what it wants
 	LRESULT dlgCode = MFC::SendMessage(hFocus, WM_GETDLGCODE,