diff --git a/libraries/controllers/src/controllers/ScriptingInterface.cpp b/libraries/controllers/src/controllers/ScriptingInterface.cpp index f49b41cbe6..9cf83725cc 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.cpp +++ b/libraries/controllers/src/controllers/ScriptingInterface.cpp @@ -178,6 +178,11 @@ namespace controller { return inputRecorder->getSaveDirectory(); } + QStringList ScriptingInterface::getRunningInputDeviceNames() { + QMutexLocker locker(&_mutex); + return _runningInputDeviceNames; + } + bool ScriptingInterface::triggerHapticPulseOnDevice(unsigned int device, float strength, float duration, controller::Hand hand) const { return DependencyManager::get()->triggerHapticPulseOnDevice(device, strength, duration, hand); } diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index b71bae60bc..ae15e47fcc 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -436,7 +437,7 @@ namespace controller { * @function Controller.getRunningInputDevices * @returns {string[]} An array of strings with the names */ - Q_INVOKABLE QStringList getRunningInputDeviceNames() { return _runningInputDeviceNames; } + Q_INVOKABLE QStringList getRunningInputDeviceNames(); bool isMouseCaptured() const { return _mouseCaptured; } bool isTouchCaptured() const { return _touchCaptured; } @@ -627,6 +628,8 @@ namespace controller { std::atomic _touchCaptured { false }; std::atomic _wheelCaptured { false }; std::atomic _actionsCaptured { false }; + + QMutex _mutex; }; }