Merge pull request #8037 from krzys-h/uwp

Fix crash in xinput with verbose logging
2019-01-18 20:21:52 +01:00 · 2019-01-18 20:21:52 +01:00 · e4731d2b5e
parent 726a014cb3 d98962189a
commit e4731d2b5e
1 changed files with 3 additions and 0 deletions
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@ -181,6 +181,9 @@ const char *xinput_joypad_name(unsigned pad)
      return XBOX_ONE_CONTROLLER_NAMES[xuser];
 #endif

+   if (xuser < 0)
+      return NULL;
+
   return XBOX_CONTROLLER_NAMES[xuser];
 }