diff options
| author | ayuanx <ayuanx@gmail.com> | 2010-01-21 06:29:31 +0000 |
|---|---|---|
| committer | ayuanx <ayuanx@gmail.com> | 2010-01-21 06:29:31 +0000 |
| commit | 6cdf13e6a7640b600a8f282ded1eae895c1d524f (patch) | |
| tree | 86fd19ff5de8ba39a3b71af7814316f87ddea3a1 /Source | |
| parent | fa309ab0ee9061b082eca6abb5b7bf5aa52d698c (diff) | |
Fixes Issue 2085
Fixes Issue 2042
Fixes Issue 1982
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4912 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp index 67f48d5fc3..f2a885639d 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp @@ -952,6 +952,7 @@ void WiimotePadConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) { case IDC_JOYNAME: WiiMoteEmu::WiiMapping[m_Page].ID = m_Joyname[m_Page]->GetSelection(); + WiiMoteEmu::WiiMapping[m_Page].joy = WiiMoteEmu::joyinfo.at(WiiMoteEmu::WiiMapping[m_Page].ID).joy; break; case IDC_DEAD_ZONE_LEFT: WiiMoteEmu::WiiMapping[m_Page].DeadZoneL = m_ComboDeadZoneLeft[m_Page]->GetSelection(); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index 262744aa38..d09953386f 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -260,9 +260,11 @@ void PADConfigDialognJoy::DoSave(bool ChangePad, int Slot) for(int i = 0; i < 4; i++) SaveButtonMapping(i, true); - g_Config.Save(Slot); // Now we can update the ID PadMapping[notebookpage].ID = m_Joyname[notebookpage]->GetSelection(); + PadState[notebookpage].joy = joyinfo.at(PadMapping[notebookpage].ID).joy; + + g_Config.Save(Slot); } else { |