Merge pull request #2246 from skidau/sdl-init-crash

Use WindowFromPoint to track the mouse in DInput

1 files changed, 1 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index a3c14a0ab5..1330cb1e0a 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -44,7 +44,7 @@ ControllerInterface g_controller_interface;
 void ControllerInterface::Initialize(void* const hwnd)
 {
 	if (m_is_init)
-		DeInit();
+		return;
 
 	m_hwnd = hwnd;
 
@@ -102,11 +102,6 @@ void ControllerInterface::Shutdown()
 		delete d;
 	}
 
-	DeInit();
-}
-
-void ControllerInterface::DeInit()
-{
 	m_devices.clear();
 
 #ifdef CIFACE_USE_XINPUT