Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 07:35:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15726 from AndrewMeadows/fix-crash-bugz511

Browse source 
BUGZ-511: fix crash in MyAvatar::updateStaleAvatarEntityBlobs()
This commit is contained in:
Shannon Romano 2019-06-10 16:56:00 -07:00 committed by GitHub
commit 77d595e02a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -2488,12 +2488,12 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() {
QVariantMap avatarEntityData; QVariantMap avatarEntityData;
avatarEntityData["id"] = entityID; avatarEntityData["id"] = entityID;
EntityItemProperties entityProperties = entity->getProperties(desiredProperties); EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
QScriptValue scriptProperties;
{ {
std::lock_guard<std::mutex> guard(_scriptEngineLock); std::lock_guard<std::mutex> guard(_scriptEngineLock);
QScriptValue scriptProperties;
scriptProperties = EntityItemPropertiesToScriptValue(_scriptEngine, entityProperties); scriptProperties = EntityItemPropertiesToScriptValue(_scriptEngine, entityProperties);
}
avatarEntityData["properties"] = scriptProperties.toVariant(); avatarEntityData["properties"] = scriptProperties.toVariant();
}
avatarEntitiesData.append(QVariant(avatarEntityData)); avatarEntitiesData.append(QVariant(avatarEntityData));
} }
} }