ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8037 from krzys-h/uwp 

Fix crash in xinput with verbose logging
This commit is contained in:
Twinaphex 2019-01-18 20:21:52 +01:00 committed by GitHub
parent 726a014cb3 d98962189a
commit e4731d2b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input/drivers_joypad/xinput_joypad.c
View File

@ -181,6 +181,9 @@ const char *xinput_joypad_name(unsigned pad)
return XBOX_ONE_CONTROLLER_NAMES[xuser]; return XBOX_ONE_CONTROLLER_NAMES[xuser];
#endif #endif
if (xuser < 0)
return NULL;
return XBOX_CONTROLLER_NAMES[xuser]; return XBOX_CONTROLLER_NAMES[xuser];
} }