From dbce9768873f57dd089cf2dcd069b7fb3131c6c7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 10 Jun 2019 15:34:18 -0700 Subject: [PATCH] fix another crash in MyAvatar::getAvatarEntitiesVariant() --- interface/src/avatar/MyAvatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b91217da63..3800a330bb 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2488,12 +2488,12 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { QVariantMap avatarEntityData; avatarEntityData["id"] = entityID; EntityItemProperties entityProperties = entity->getProperties(desiredProperties); - QScriptValue scriptProperties; { std::lock_guard guard(_scriptEngineLock); + QScriptValue scriptProperties; scriptProperties = EntityItemPropertiesToScriptValue(_scriptEngine, entityProperties); + avatarEntityData["properties"] = scriptProperties.toVariant(); } - avatarEntityData["properties"] = scriptProperties.toVariant(); avatarEntitiesData.append(QVariant(avatarEntityData)); } }