From 7218a070e6e36ddab1ae8a474da98c8e1d4cfc68 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Tue, 17 Feb 2009 11:25:18 +0000 Subject: [PATCH] Emulated Wiimote: Fixed typo in last commit git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2288 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp | 5 +++-- Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp index b706ed22b4..e372f7e597 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp @@ -583,8 +583,9 @@ void ConfigDialog::PadGetStatus() { //Console::Print("SDL_WasInit: %i\n", SDL_WasInit(0)); - // Return if it's not detected - if(WiiMoteEmu::PadMapping[Page].ID >= SDL_NumJoysticks()) + /* Return if it's not detected. The ID should never be less than zero here, it can only be that + because of a manual ini file change, but we make that check anway. */ + if(WiiMoteEmu::PadMapping[Page].ID < 0 || WiiMoteEmu::PadMapping[Page].ID >= SDL_NumJoysticks()) { m_TStatusLeftIn[Page]->SetLabel(wxT("Not connected")); m_TStatusLeftOut[Page]->SetLabel(wxT("Not connected")); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp index 2958cb824d..93933869c5 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp @@ -50,7 +50,7 @@ void ConfigBox::PadGetStatus() { /* Return if it's not detected. The ID should never be less than zero here, it can only be that because of a manual ini file change, but we make that check anway. */ - if(PadMapping[notebookpage].ID >= 0 && PadMapping[notebookpage].ID >= SDL_NumJoysticks()) + if(PadMapping[notebookpage].ID < 0 || PadMapping[notebookpage].ID >= SDL_NumJoysticks()) { m_TStatusIn[notebookpage]->SetLabel(wxT("Not connected")); m_TStatusOut[notebookpage]->SetLabel(wxT("Not connected"));