From f3f7ce1be6c65890b830481ebddd464f8027ed88 Mon Sep 17 00:00:00 2001 From: ayuanx Date: Sat, 2 Jan 2010 09:05:33 +0000 Subject: [PATCH] Fixed Issue 1915 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4774 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index a1ef9e7b2e..c9766b1764 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -420,18 +420,17 @@ void PADConfigDialognJoy::ChangeSettings( wxCommandEvent& event ) if(!g_Config.bSaveByID) { PadMapping[notebookpage].controllertype = m_ControlType[notebookpage]->GetSelection(); - //UpdateGUI(notebookpage); + UpdateGUI(notebookpage); } case IDC_TRIGGERTYPE: if(!g_Config.bSaveByID) { PadMapping[notebookpage].triggertype = m_TriggerType[notebookpage]->GetSelection(); - //UpdateGUI(notebookpage); + UpdateGUI(notebookpage); } break; case IDC_ENABLERUMBLE: PadMapping[notebookpage].rumble = m_Rumble[notebookpage]->IsChecked(); - //UpdateGUI(notebookpage); break; case IDC_RUMBLESTRENGTH: g_Config.RumbleStrength = m_RStrength[notebookpage]->GetSelection(); @@ -474,7 +473,7 @@ void PADConfigDialognJoy::UpdateGUI(int _notebookpage) m_JoyShoulderR[_notebookpage]->GetValue().ToLong(&Right); bool AnalogTrigger = (Left >= 1000 || Right >= 1000); #ifdef _WIN32 - bool XInput = XInput::IsConnected(0); + bool XInput = XInput::IsConnected(PadMapping[_notebookpage].ID); #endif // Hat type selection