From 780eef68f6ec7deee1a11f8bc1386f70133b6cc0 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 5 Mar 2015 19:49:10 +1100 Subject: Fixed the crash that would occur when the Refresh button was pressed in the controllers config. - Simplified the locking mechanism when controllers were updated - Reloaded the config of the controls instead of re-initialising the control plugins - Fixed controls being unresponsive after the Refresh button was pressed - Disables the hotkeys while the controller config is open --- .../Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 3 --- Source/Core/InputCommon/InputConfig.cpp | 7 ------- Source/Core/InputCommon/InputConfig.h | 2 -- 3 files changed, 12 deletions(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 3eb1b95ff2..1330cb1e0a 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -136,9 +136,6 @@ void ControllerInterface::UpdateInput() { std::unique_lock lk(update_lock, std::defer_lock); - if (!lk.try_lock()) - return; - for (ciface::Core::Device* d : m_devices) d->UpdateInput(); } diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index da5bb5081a..ef517d407d 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -7,13 +7,6 @@ #include "Core/HW/Wiimote.h" #include "InputCommon/InputConfig.h" -InputConfig::~InputConfig() -{ - // delete pads - for (ControllerEmu* pad : controllers) - delete pad; -} - bool InputConfig::LoadConfig(bool isGC) { IniFile inifile; diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index e6e80c83fc..a234cdf167 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -21,8 +21,6 @@ public: const char* const _profile_name) : ini_name(_ini_name), gui_name(_gui_name), profile_name(_profile_name) {} - ~InputConfig(); - bool LoadConfig(bool isGC); void SaveConfig(); -- cgit v1.2.3