Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index bc1e115c17..7287c380d5 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -99,7 +99,7 @@ void ControllerInterface::Shutdown()
 	m_devices.clear();
 
 #ifdef CIFACE_USE_XINPUT
-	// nothing needed
+	ciface::XInput::DeInit();
 #endif
 #ifdef CIFACE_USE_DINPUT
 	// nothing needed
@@ -249,7 +249,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int
 	if (device->Inputs().size() == 0)
 		return NULL;
 
-	// get starting state of all inputs, 
+	// get starting state of all inputs,
 	// so we can ignore those that were activated at time of Detect start
 	std::vector<Device::Input*>::const_iterator
 		i = device->Inputs().begin(),
@@ -308,7 +308,7 @@ Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int
 			device->UpdateOutput();
 			Common::SleepCurrentThread(10);
 		}
-		
+
 		State(0);
 		device->UpdateOutput();
 	}