diff options
| author | skidau <skidau@gmail.com> | 2015-03-09 11:30:33 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-09 11:30:33 +1100 |
| commit | d92efc4a3e3fb78f253e10dfd14b9abf2ff5a36d (patch) | |
| tree | 5f3ea47c48f1fffb7db02bab1caf43ca9e164d0f /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | a1dbe8e46381e833ffd75887e8d88e3de4aed400 (diff) | |
| parent | b200e83b02967c55d6b04077f3b88b3efb3ecf85 (diff) | |
Merge pull request #2190 from skidau/wiimote-profiles
Fixed the wiimote profiles not taking effect.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index fda4f4ee0e..ec28339369 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1362,8 +1362,6 @@ void CFrame::OnConfigMenuCommands(wxCommandEvent& WXUNUSED(event)) void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) { - bool was_init = false; - InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig(); // check if game is running @@ -1380,8 +1378,7 @@ void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) m_ConfigFrame.ShowModal(); // Update references in case controllers were refreshed - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) - Wiimote::LoadConfig(); + Wiimote::LoadConfig(); Keyboard::LoadConfig(); Pad::LoadConfig(); HotkeyManagerEmu::LoadConfig(); |