From f3c89dd9d733b6d108efa50260944f14be085e72 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Mon, 1 Oct 2018 13:08:14 -0700 Subject: [PATCH] Same mutex --- libraries/controllers/src/controllers/ScriptingInterface.cpp | 4 ++-- libraries/controllers/src/controllers/ScriptingInterface.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/controllers/src/controllers/ScriptingInterface.cpp b/libraries/controllers/src/controllers/ScriptingInterface.cpp index 72e5cf5007..ce730bffa8 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.cpp +++ b/libraries/controllers/src/controllers/ScriptingInterface.cpp @@ -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); } diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index 0d61fe6636..157730e7c6 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -626,8 +626,7 @@ namespace controller { std::atomic _wheelCaptured { false }; std::atomic _actionsCaptured { false }; - QMutex _setRunningDevicesMutex; - QMutex _getRunningDevicesMutex; + QMutex _runningDevicesMutex; }; }