summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-03-28 11:08:25 +1100
committerskidau <skidau@gmail.com>2015-03-28 11:08:25 +1100
commit4f965da4f185e654d20838f75321c5a3fe68356f (patch)
tree3b50a279fba7a427e93024ed78bd7b70742f6c25 /Source/Core/InputCommon
parent74f25ad8ecef9315add7983f7c98b182a7771e45 (diff)
Revert the recent changes related to updating hwnd
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h3
2 files changed, 1 insertions, 9 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
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;