summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/InputConfig.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-03-05 19:49:10 +1100
committerskidau <skidau@gmail.com>2015-03-08 20:27:13 +1100
commit780eef68f6ec7deee1a11f8bc1386f70133b6cc0 (patch)
tree9817364bdf1ac1e9ff73de1029a07e45b32c8f5e /Source/Core/InputCommon/InputConfig.cpp
parentb446ea013241fc28797f5bfdfdb40b374394baed (diff)
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
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
-rw-r--r--Source/Core/InputCommon/InputConfig.cpp7
1 files changed, 0 insertions, 7 deletions
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;