Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Same mutex

Browse source
This commit is contained in:
luiscuenca 2018-10-01 13:08:14 -07:00
parent c1aa5e9308
commit f3c89dd9d7
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/controllers/src/controllers/ScriptingInterface.cpp
View file

@ -179,12 +179,12 @@ namespace controller {
}
QStringList ScriptingInterface::getRunningInputDeviceNames() {
QMutexLocker locker(&_getRunningDevicesMutex);
QMutexLocker locker(&_runningDevicesMutex);
return _runningInputDeviceNames;
}
void ScriptingInterface::updateRunningInputDevices(const QString& deviceName, bool isRunning, const QStringList& runningDevices) {
QMutexLocker locker(&_setRunningDevicesMutex);
QMutexLocker locker(&_runningDevicesMutex);
_runningInputDeviceNames = runningDevices;
emit inputDeviceRunningChanged(deviceName, isRunning);
}

3
libraries/controllers/src/controllers/ScriptingInterface.h
View file

@ -626,8 +626,7 @@ namespace controller {
std::atomic<bool> _wheelCaptured { false };
std::atomic<bool> _actionsCaptured { false };
QMutex _setRunningDevicesMutex;
QMutex _getRunningDevicesMutex;
QMutex _runningDevicesMutex;
};
}