Qt: Fix non-SDL build (fixes #1656)

This commit is contained in:
Vicki Pfau 2020-01-31 18:09:58 -08:00
parent d4ca59df16
commit 3deb44b626
2 changed files with 13 additions and 0 deletions

View File

@ -26,6 +26,7 @@ Other fixes:
- Util: Fix crash reading invalid ELFs
Misc:
- Qt: Renderer can be changed while a game is running
- Qt: Fix non-SDL build (fixes mgba.io/i/1656)
- Switch: Make OpenGL scale adjustable while running
0.8.0: (2020-01-21)

View File

@ -271,9 +271,21 @@ void InputController::setPreferredGamepad(uint32_t type, int index) {
if (!m_config) {
return;
}
#ifdef BUILD_SDL
char name[34] = {0};
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick), name, sizeof(name));
#else
const char* name = SDL_JoystickName(SDL_JoystickIndex(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick));
if (!name) {
return;
}
#endif
mInputSetPreferredDevice(m_config->input(), "gba", type, m_playerId, name);
#else
UNUSED(type);
UNUSED(index);
#endif
}
mRumble* InputController::rumble() {