From 9e1aab663f2afdd61bda773764cc3c8f652659aa Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 8 Jun 2015 13:43:39 +1200 Subject: Revert "SDL: handle SDL_QUIT event" --- .../Core/InputCommon/ControllerInterface/SDL/SDL.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 6e60cf0f7a..6cdfa470cd 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -7,7 +7,6 @@ #include #include "Common/StringUtil.h" -#include "Core/Host.h" #include "InputCommon/ControllerInterface/SDL/SDL.h" #ifdef _WIN32 @@ -68,19 +67,6 @@ void Init( std::vector& devices ) } } -void UpdateInput() -{ - // Using SDL_INIT_JOYSTICK implies SDL_INIT_EVENT which installs a signal handler for SIGINT and SIGTERM. - // In the future, we will be able to prevent this from happening: - // SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); - // but this was added after SDL 2.0.3 and is scheduled to be included in 2.0.4. - // Until then, handle SDL_QUIT events here and tell Dolphin to exit. - if (SDL_QuitRequested()) - Host_Message(WM_USER_QUIT); - - SDL_JoystickUpdate(); -} - Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index) : m_joystick(joystick) , m_sdl_index(sdl_index) @@ -297,6 +283,12 @@ void Joystick::LeftRightEffect::SetSDLHapticEffect(ControlState state) } #endif +void Joystick::UpdateInput() +{ + // each joystick is doin this, o well + SDL_JoystickUpdate(); +} + std::string Joystick::GetName() const { return StripSpaces(GetJoystickName(m_sdl_index)); -- cgit v1.2.3