X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=8ddf4e9b87e6704dac106abc5f7004dccb75022d;hp=64fda8081da0fab274d5f3008bb35369d4a5f486;hb=be1b616f2f6738d1d143df80031dc6b9cd35594f;hpb=6746a99c1d7348748c06d457f8496b4253bb7c84;ds=sidebyside

diff --git a/src/events.c b/src/events.c
index 64fda808..8ddf4e9b 100644
--- a/src/events.c
+++ b/src/events.c
@@ -378,6 +378,8 @@ void ClearPlayerAction()
   key_joystick_mapping = 0;
   for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].action = 0;
+
+  ClearJoystickState();
 }
 
 void SleepWhileUnmapped()
@@ -1540,9 +1542,11 @@ void HandleKey(Key key, int key_status)
   int i;
 
 #if defined(TARGET_SDL2)
-  /* map special "play/pause" media key to default key for play/pause actions */
+  /* map special keys (media keys / remote control buttons) to default keys */
   if (key == KSYM_PlayPause)
     key = KSYM_space;
+  else if (key == KSYM_Select)
+    key = KSYM_Return;
 #endif
 
   HandleSpecialGameControllerKeys(key, key_status);