summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Android/ButtonManager.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-09-06 20:07:32 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2015-09-06 20:07:32 -0500
commit99a7dfaf5ef86608b2c582618eb0e730a663758f (patch)
tree0f57bf71e87f1fd1e32ceebd74747679e5002eea /Source/Core/DolphinWX/Android/ButtonManager.cpp
parent1b026364bf933457de46ab4334fb2a3aa386631d (diff)
parent9bb63bf2eb66a13705ca67f449d4819cbfcdf053 (diff)
Merge pull request #2965 from Sonicadvance1/Android_config_changes
[Android] Fix multi-gamecube controller input, config changes
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
-rw-r--r--Source/Core/DolphinWX/Android/ButtonManager.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index 5b5d8242fa..cede1887d4 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -201,20 +201,12 @@ namespace ButtonManager
auto it = m_controllers.find(dev);
if (it != m_controllers.end())
return it->second->PressEvent(button, action);
-
- m_controllers[dev] = new InputDevice(dev);
- return m_controllers[dev]->PressEvent(button, action);
}
void GamepadAxisEvent(const std::string& dev, int axis, float value)
{
auto it = m_controllers.find(dev);
if (it != m_controllers.end())
- {
it->second->AxisEvent(axis, value);
- return;
- }
- m_controllers[dev] = new InputDevice(dev);
- m_controllers[dev]->AxisEvent(axis, value);
}
void Shutdown()
{