From 0681f76a1df92bb92599623478322f906f2405f8 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Wed, 11 Feb 2009 10:31:43 +0000 Subject: [PATCH] Last commit: Forgot one change git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2216 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp index 43e1724f0d..6b8c3991a0 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp @@ -257,10 +257,12 @@ void Initialize(void *init) #endif // Populate joyinfo for all attached devices if the configuration window is not already open - if(!m_frame) Search_Devices(joyinfo, NumPads, NumGoodPads); - - // Check if a DirectInput error occured - if(ReloadDLL()) g_PADInitialize->padNumber = -1; + if(!m_frame) + { + Search_Devices(joyinfo, NumPads, NumGoodPads); + // Check if a DirectInput error occured + if(ReloadDLL()) g_PADInitialize->padNumber = -1; + } } bool Search_Devices(std::vector &_joyinfo, int &_NumPads, int &_NumGoodPads)