Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal

Fix unprotected tree traversals

Seth Alves committed 8 years ago

Commit 7f285c52 parents 7c65c9c 895023c4 files · +65 −34Browse files

Showing the changes to libraries/entities/src/SimpleEntitySimulation.cpp (1 of 4 files). Show all

Unified · Split

@@ -37,8 +37,13 @@ void SimpleEntitySimulation::clearOwnership(const QUuid& ownerID) { · 36 unmodified lines
37	37	// remove ownership and dirty all the tree elements that contain the it
38	38	entity->clearSimulationOwnership();
39	39	entity->markAsChangedOnServer();
40		− DirtyOctreeElementOperator op(entity->getElement());
41		− getEntityTree()->recurseTreeWithOperator(&op);
	40	+ if (auto element = entity->getElement()) {
	41	+ auto tree = getEntityTree();
	42	+ tree->withReadLock([&] {
	43	+ DirtyOctreeElementOperator op(element);
	44	+ tree->recurseTreeWithOperator(&op);
	45	+ });
	46	+ }
42	47	} else {
43	48	++itemItr;
44	49	}

Keyboard shortcuts