From 28d673cb97740dc9e71b540beadecd48b6c5b81f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 19 Jan 2016 16:00:02 -0800 Subject: [PATCH] try again to make this thread safe --- libraries/entities/src/EntityScriptingInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 3f7bc83386..8fd7be912e 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -979,7 +979,7 @@ int EntityScriptingInterface::getJointIndex(const QUuid& entityID, const QString } int result; QMetaObject::invokeMethod(_entityTree.get(), "getJointIndex", Qt::BlockingQueuedConnection, - Q_ARG(QUuid, entityID), Q_ARG(QString, name), Q_RETURN_ARG(int, result)); + Q_RETURN_ARG(int, result), Q_ARG(QUuid, entityID), Q_ARG(QString, name)); return result; } @@ -989,6 +989,6 @@ QStringList EntityScriptingInterface::getJointNames(const QUuid& entityID) { } QStringList result; QMetaObject::invokeMethod(_entityTree.get(), "getJointNames", Qt::BlockingQueuedConnection, - Q_ARG(QUuid, entityID), Q_RETURN_ARG(QStringList, result)); + Q_RETURN_ARG(QStringList, result), Q_ARG(QUuid, entityID)); return result; }