mirror/antimicrox
1
0
Fork 0
mirror of https://github.com/AntiMicroX/antimicrox.git synced 2026-08-01 01:56:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't double lock settings when refreshing joystick list.

Browse Source 
Bad copy paste
This commit is contained in:
Travis Nickles
2016-02-27 11:47:09 -06:00
parent fd34684f96
commit 3aef54d4a3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/inputdaemon.cpp
View File

@@ -162,9 +162,7 @@ void InputDaemon::refreshJoysticks()
#ifdef USE_SDL_2
trackjoysticks.clear();
trackcontrollers.clear();
#endif
#ifdef USE_SDL_2
settings->getLock()->lock();
settings->beginGroup("Mappings");
#endif
@@ -187,8 +185,8 @@ void InputDaemon::refreshJoysticks()
// Check if device has already been grabbed.
if (!joysticks->contains(tempJoystickID))
{
settings->getLock()->lock();
settings->beginGroup("Mappings");
//settings->getLock()->lock();
//settings->beginGroup("Mappings");
QString temp;
SDL_JoystickGUID tempGUID = SDL_JoystickGetGUID(sdlStick);
@@ -198,8 +196,8 @@ void InputDaemon::refreshJoysticks()
bool disableGameController = settings->value(QString("%1Disable").arg(temp), false).toBool();
settings->endGroup();
settings->getLock()->unlock();
//settings->endGroup();
//settings->getLock()->unlock();
// Check if user has designated device Joystick mode.
if (!disableGameController)