Fixed #823: Controller in Mouse mode didn't trigger Retroarch Quit combo

BlitterStudio · Sep 4, 2021 · 73f207e · 73f207e
1 parent 908d294
commit 73f207e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/inputdevice.cpp b/src/inputdevice.cpp
@@ -6935,8 +6935,19 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
 					break;
 				case JSEM_MODE_MOUSE:
 				case JSEM_MODE_WHEELMOUSE:
-					input_get_default_mouse (joysticks, joy, i, af, !gameports, mode == JSEM_MODE_WHEELMOUSE, true);
-					joymodes[i] = JSEM_MODE_WHEELMOUSE;
+#ifdef AMIBERRY
+					// This allows us to use Retroarch hotkeys when having a controller in Mouse mode
+					if (currprefs.jports[i].id >= JSEM_MICE && currprefs.jports[i].id < JSEM_END)
+					{
+						input_get_default_mouse(joysticks, joy, i, af, !gameports, mode == JSEM_MODE_WHEELMOUSE, true);
+						joymodes[i] = JSEM_MODE_WHEELMOUSE;
+					}
+					else
+					{
+						input_get_default_joystick(joysticks, joy, i, af, mode, !gameports, false);
+						joymodes[i] = JSEM_MODE_WHEELMOUSE;
+					}
+#endif
 					break;
 				case JSEM_MODE_LIGHTPEN:
 					input_get_default_lightpen (joysticks, joy, i, af, !gameports, true, submode);