summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2015-06-05 19:34:06 +0200
committerTillmann Karras <tilkax@gmail.com>2015-06-05 19:34:06 +0200
commit9ec5a4544f207a31678e6c5c7636873e9d9e88a1 (patch)
tree738635e69cec2d2b8b840ac4dd02f74874e777ee /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parent2f2e514b54cdb327f07471b562ad1ad6a375c509 (diff)
SDL: handle SDL_QUIT event
Using SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS which installs a signal handler for SIGINT and SIGTERM. There will be a way to prevent this in 2.0.4 but for now we'll need to handle SDL_QUIT.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp5
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();
}