piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Gamepad (minor) > Fix to last commit

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4549 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-11-12 23:39:43 +00:00
parent 7c1d118913
commit 0837e38c39
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,24 +445,21 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
{
// Turn off device polling while searching
EnablePolling(false);
//DEBUG_LOG(PAD, "LocalSearchDevices");
bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads);
DoLocalSearchDevices(_joyinfo, _NumPads);
EnablePolling(true);
return Success;
}
bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
{
//DEBUG_LOG(PAD, "LocalSearchDevicesUpdate: %i", IsPolling());
bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
// Turn off device polling while resetting
EnablePolling(false);
bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
EnablePolling(true);
DoLocalSearchDevices(_joyinfo, _NumPads);