Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11130 from zfox23/contextOverlays_fixCrash1

Browse source 
Fix crash in Context Overlays code
This commit is contained in:
Zach Fox 2017-08-07 11:29:30 -07:00 committed by GitHub
commit 36453644e0
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -257,15 +257,23 @@ void ContextOverlayInterface::openMarketplace() {
} }
void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) { void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) {
if (!qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->getShouldHighlight()) { auto entityTree = qApp->getEntities()->getTree();
qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID; entityTree->withReadLock([&] {
qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true); auto entityItem = entityTree->findEntityByEntityItemID(entityItemID);
} if ((entityItem != NULL) && !entityItem->getShouldHighlight()) {
qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
entityItem->setShouldHighlight(true);
}
});
} }
void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) { void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) {
if (qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->getShouldHighlight()) { auto entityTree = qApp->getEntities()->getTree();
qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID; entityTree->withReadLock([&] {
qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(false); auto entityItem = entityTree->findEntityByEntityItemID(entityItemID);
} if ((entityItem != NULL) && entityItem->getShouldHighlight()) {
qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID;
entityItem->setShouldHighlight(false);
}
});
} }