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

Last commit: Forgot one change 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2216 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-11 10:31:43 +00:00
parent 68f39cb287
commit 0681f76a1d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -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<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)