diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-28 23:08:56 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-28 23:08:56 +0100 |
| commit | bc844a168fe54174cd4de04e17ef23849e1fcccb (patch) | |
| tree | 1293208fb1072c1f13cdf16006190a18a7882dfd /Source/Core/DolphinWX/Android/ButtonManager.cpp | |
| parent | 1a7e3b3227070fcac6499e6e9eaa8d8ad3ef3e49 (diff) | |
| parent | 892012dc02d13229e88db1809f7b785fc3516787 (diff) | |
Merge pull request #100 from Tilka/misc_fixes
Misc fixes
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Android/ButtonManager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index a8ebafdd20..e945f0638a 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -114,8 +114,7 @@ namespace ButtonManager } bool GetButtonPressed(int padID, ButtonType button) { - bool pressed = false; - pressed = m_buttons[std::make_pair(padID, button)]->Pressed(); + bool pressed = m_buttons[std::make_pair(padID, button)]->Pressed(); for (const auto& ctrl : m_controllers) pressed |= ctrl.second->ButtonValue(padID, button); |