Merge pull request #6507 from birarda/es-deadlock

don't persist the octree if it never loaded
This commit is contained in:
Seth Alves 2015-12-01 10:11:53 -08:00
commit 2c886658ba

View file

@ -248,7 +248,7 @@ QByteArray OctreePersistThread::getPersistFileContents() const {
}
void OctreePersistThread::persist() {
if (_tree->isDirty()) {
if (_tree->isDirty() && _initialLoadComplete) {
_tree->withWriteLock([&] {
qCDebug(octree) << "pruning Octree before saving...";