diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-06-08 12:09:52 +1000 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-06-08 12:09:52 +1000 |
| commit | bfeb79620d43b7785c98f84f5d86615887ca90a2 (patch) | |
| tree | 48fba2b89f16dc36bf44de08281862a6fa635ba8 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 7b3932e5b5dadb0055cac2d4a62be8e9032cbf0d (diff) | |
| parent | 9e1aab663f2afdd61bda773764cc3c8f652659aa (diff) | |
Merge pull request #2565 from dolphin-emu/revert-2530-sdl_quit
Revert "SDL: handle SDL_QUIT event"
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 2c87e77f01..6b8b11fd3a 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -134,11 +134,6 @@ void ControllerInterface::Shutdown() // void ControllerInterface::UpdateInput() { -#ifdef CIFACE_USE_SDL - // SDL currently also handles SIGINT and SIGTERM, - // so make sure to update it even if there is no SDL device. - ciface::SDL::UpdateInput(); -#endif for (ciface::Core::Device* d : m_devices) d->UpdateInput(); } |