From 4f965da4f185e654d20838f75321c5a3fe68356f Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 28 Mar 2015 11:08:25 +1100 Subject: Revert the recent changes related to updating hwnd --- .../Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 7 +------ Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface') 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 diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 1b2c93951f..9ab8427ad2 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -117,9 +117,6 @@ public: void Initialize(void* const hwnd); void Reinitialize(); void Shutdown(); - - void DeInit(); - bool IsInit() const { return m_is_init; } void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const; -- cgit v1.2.3