ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2190 from skidau/wiimote-profiles 

Fixed the wiimote profiles not taking effect.
This commit is contained in:
skidau 2015-03-09 11:30:33 +11:00
parent a1dbe8e463 b200e83b02
commit d92efc4a3e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/Wiimote.cpp
View File

@ -57,7 +57,7 @@ void Initialize(void* const hwnd, bool wait)
void LoadConfig() void LoadConfig()
{ {
s_config.LoadConfig(true); s_config.LoadConfig(false);
} }

3
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1362,8 +1362,6 @@ void CFrame::OnConfigMenuCommands(wxCommandEvent& WXUNUSED(event))
void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
{ {
bool was_init = false;
InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig(); InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig();
// check if game is running // check if game is running
@ -1380,7 +1378,6 @@ void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
m_ConfigFrame.ShowModal(); m_ConfigFrame.ShowModal();
// Update references in case controllers were refreshed // Update references in case controllers were refreshed
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
Wiimote::LoadConfig(); Wiimote::LoadConfig();
Keyboard::LoadConfig(); Keyboard::LoadConfig();
Pad::LoadConfig(); Pad::LoadConfig();

1
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@ -757,7 +757,6 @@ void GamepadPage::RefreshDevices(wxCommandEvent&)
// update device cbox // update device cbox
m_config_dialog->UpdateDeviceComboBox(); m_config_dialog->UpdateDeviceComboBox();
//if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
Wiimote::LoadConfig(); Wiimote::LoadConfig();
Keyboard::LoadConfig(); Keyboard::LoadConfig();
Pad::LoadConfig(); Pad::LoadConfig();