summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2018-06-04 18:12:29 +0200
committerGitHub <noreply@github.com>2018-06-04 18:12:29 +0200
commitb26a47e6425c00020de11756239f9828638d28df (patch)
treeaec69af7d6ef6e7012ec024ad1cb6a6a3ee779c1 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parent8e0ea92ec35a0473e79ef012b9f98b7a38d3ef33 (diff)
parent932ca644aa92c01d60827206562938bfd877ecb3 (diff)
Merge pull request #6180 from ligfx/sdlhotplug
Add hotplug support to SDL2 controller backend
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index 328258a8b2..0e6857c137 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -158,8 +158,7 @@ void ControllerInterface::Shutdown()
ciface::Quartz::DeInit();
#endif
#ifdef CIFACE_USE_SDL
- // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
- SDL_Quit();
+ ciface::SDL::DeInit();
#endif
#ifdef CIFACE_USE_ANDROID
// nothing needed