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

Fixed Issue 1915 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4774 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx 2010-01-02 09:05:33 +00:00
parent 92ef4f1156
commit f3f7ce1be6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,18 +420,17 @@ void PADConfigDialognJoy::ChangeSettings( wxCommandEvent& event )
if(!g_Config.bSaveByID) if(!g_Config.bSaveByID)
{ {
PadMapping[notebookpage].controllertype = m_ControlType[notebookpage]->GetSelection(); PadMapping[notebookpage].controllertype = m_ControlType[notebookpage]->GetSelection();
//UpdateGUI(notebookpage); UpdateGUI(notebookpage);
} }
case IDC_TRIGGERTYPE: case IDC_TRIGGERTYPE:
if(!g_Config.bSaveByID) if(!g_Config.bSaveByID)
{ {
PadMapping[notebookpage].triggertype = m_TriggerType[notebookpage]->GetSelection(); PadMapping[notebookpage].triggertype = m_TriggerType[notebookpage]->GetSelection();
//UpdateGUI(notebookpage); UpdateGUI(notebookpage);
} }
break; break;
case IDC_ENABLERUMBLE: case IDC_ENABLERUMBLE:
PadMapping[notebookpage].rumble = m_Rumble[notebookpage]->IsChecked(); PadMapping[notebookpage].rumble = m_Rumble[notebookpage]->IsChecked();
//UpdateGUI(notebookpage);
break; break;
case IDC_RUMBLESTRENGTH: case IDC_RUMBLESTRENGTH:
g_Config.RumbleStrength = m_RStrength[notebookpage]->GetSelection(); g_Config.RumbleStrength = m_RStrength[notebookpage]->GetSelection();
@ -474,7 +473,7 @@ void PADConfigDialognJoy::UpdateGUI(int _notebookpage)
m_JoyShoulderR[_notebookpage]->GetValue().ToLong(&Right); m_JoyShoulderR[_notebookpage]->GetValue().ToLong(&Right);
bool AnalogTrigger = (Left >= 1000 || Right >= 1000); bool AnalogTrigger = (Left >= 1000 || Right >= 1000);
#ifdef _WIN32 #ifdef _WIN32
bool XInput = XInput::IsConnected(0); bool XInput = XInput::IsConnected(PadMapping[_notebookpage].ID);
#endif #endif
// Hat type selection // Hat type selection