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

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
This commit is contained in:
ayuanx 2010-01-21 06:29:31 +00:00
parent fa309ab0ee
commit 6cdf13e6a7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -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();

4
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -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
{