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

SDLJoystick: store name on creation 

Otherwise, Dolphin will crash when the joystick is removed.
This commit is contained in:
Michael M 2017-11-09 14:04:31 -08:00 committed by Léo Lam
parent 0eb47e1071
commit 7062967b5b
2 changed files with 3 additions and 3 deletions
Source/Core/InputCommon/ControllerInterface/SDL
SDL.cppSDL.h

4
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -69,7 +69,7 @@ void PopulateDevices()
} }
Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index) Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index)
: m_joystick(joystick), m_sdl_index(sdl_index) : m_joystick(joystick), m_name(StripSpaces(GetJoystickName(sdl_index)))
{ {
// really bad HACKS: // really bad HACKS:
// to not use SDL for an XInput device // to not use SDL for an XInput device
@ -284,7 +284,7 @@ void Joystick::UpdateInput()
std::string Joystick::GetName() const std::string Joystick::GetName() const
{ {
return StripSpaces(GetJoystickName(m_sdl_index)); return m_name;
} }
std::string Joystick::GetSource() const std::string Joystick::GetSource() const

2
Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View File

@ -151,7 +151,7 @@ public:
private: private:
SDL_Joystick* const m_joystick; SDL_Joystick* const m_joystick;
const int m_sdl_index; std::string m_name;
#ifdef USE_SDL_HAPTIC #ifdef USE_SDL_HAPTIC
SDL_Haptic* m_haptic; SDL_Haptic* m_haptic;