Merge pull request #17247 from hrydgard/ignore-mode-key

Always tell Android we handled the BUTTON_MODE key
hrydgard · Apr 6, 2023 · ec6bdbc · ec6bdbc
2 parents f390c3a + d5f131f
commit ec6bdbc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
@@ -1275,6 +1275,13 @@ bool NativeKey(const KeyInput &key) {
 		HLEPlugins::PluginDataKeys[key.keyCode] = (key.flags & KEY_DOWN) ? 1 : 0;
 		retval = g_screenManager->key(key);
 	}
+
+	// The Mode key can have weird consequences on some devices, see #17245.
+	if (key.keyCode == NKCODE_BUTTON_MODE) {
+		// Tell the caller that we handled the key.
+		retval = true;
+	}
+
 	return retval;
 }