diff options
| author | flacs <tilkax@gmail.com> | 2015-06-05 19:53:24 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-06-05 19:53:24 +0200 |
| commit | b9821916dcc0368a8ad2bf2b223db1af6d334129 (patch) | |
| tree | 7c9a783ad7a816f6cf42536844f338fe8797d9b0 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 175e0d19269955fa8cbd4638ec30a8047a3b8af7 (diff) | |
| parent | 9ec5a4544f207a31678e6c5c7636873e9d9e88a1 (diff) | |
Merge pull request #2530 from Tilka/sdl_quit
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, 5 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 6b8b11fd3a..2c87e77f01 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -134,6 +134,11 @@ 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(); } |