History

try again to make this thread safe

Seth Alves committed 10 years ago

Commit 28d673c1 parent 0064ee61 file · +2 −2Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−2
@@ -979,7 +979,7 @@ int EntityScriptingInterface::getJointIndex(const QUuid& entityID, const QString · 978 unmodified lines
979 }979 }
980 int result;980 int result;
981 QMetaObject::invokeMethod(_entityTree.get(), "getJointIndex", Qt::BlockingQueuedConnection,981 QMetaObject::invokeMethod(_entityTree.get(), "getJointIndex", Qt::BlockingQueuedConnection,
982 Q_ARG(QUuid, entityID), Q_ARG(QString, name), Q_RETURN_ARG(int, result));982 Q_RETURN_ARG(int, result), Q_ARG(QUuid, entityID), Q_ARG(QString, name));
983 return result;983 return result;
984}984}
985 985
@@ -989,6 +989,6 @@ QStringList EntityScriptingInterface::getJointNames(const QUuid& entityID) { · 3 unmodified lines
989 }989 }
990 QStringList result;990 QStringList result;
991 QMetaObject::invokeMethod(_entityTree.get(), "getJointNames", Qt::BlockingQueuedConnection,991 QMetaObject::invokeMethod(_entityTree.get(), "getJointNames", Qt::BlockingQueuedConnection,
992 Q_ARG(QUuid, entityID), Q_RETURN_ARG(QStringList, result));992 Q_RETURN_ARG(QStringList, result), Q_ARG(QUuid, entityID));
993 return result;993 return result;
994}994}