From cae9bc7a0f97a2496f1bbcd6381cc4ed00fb4ecf Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 22 Jan 2014 16:13:37 -0800 Subject: [PATCH 1/4] possible fix to particle server crashes --- libraries/particle-server/src/ParticleServer.cpp | 2 +- libraries/particles/src/ParticleTree.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/particle-server/src/ParticleServer.cpp b/libraries/particle-server/src/ParticleServer.cpp index 9d7d70db83..8c5b437374 100644 --- a/libraries/particle-server/src/ParticleServer.cpp +++ b/libraries/particle-server/src/ParticleServer.cpp @@ -118,7 +118,7 @@ int ParticleServer::sendSpecialPacket(Node* node) { void ParticleServer::pruneDeletedParticles() { ParticleTree* tree = static_cast(_tree); - if (tree->hasAnyDeletedParticles()) { + if (tree && tree->hasAnyDeletedParticles()) { //qDebug() << "there are some deleted particles to consider..."; uint64_t earliestLastDeletedParticlesSent = usecTimestampNow() + 1; // in the future diff --git a/libraries/particles/src/ParticleTree.cpp b/libraries/particles/src/ParticleTree.cpp index a3c8072b3a..5e5fa77857 100644 --- a/libraries/particles/src/ParticleTree.cpp +++ b/libraries/particles/src/ParticleTree.cpp @@ -398,7 +398,9 @@ void ParticleTree::forgetParticlesDeletedBefore(uint64_t sinceTime) { //qDebug() << "YES older... time/key:" << iterator.key(); _recentlyDeletedParticleIDs.remove(iterator.key()); } - ++iterator; + if (iterator != _recentlyDeletedParticleIDs.constEnd()) { + ++iterator; + } } _recentlyDeletedParticlesLock.unlock(); } From 521758cffc1cf870e0d8fec8f1a8d110c4cbcbdd Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 22 Jan 2014 16:20:27 -0800 Subject: [PATCH 2/4] Revert "possible fix to particle server crashes" This reverts commit cae9bc7a0f97a2496f1bbcd6381cc4ed00fb4ecf. --- libraries/particle-server/src/ParticleServer.cpp | 2 +- libraries/particles/src/ParticleTree.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/particle-server/src/ParticleServer.cpp b/libraries/particle-server/src/ParticleServer.cpp index 8c5b437374..9d7d70db83 100644 --- a/libraries/particle-server/src/ParticleServer.cpp +++ b/libraries/particle-server/src/ParticleServer.cpp @@ -118,7 +118,7 @@ int ParticleServer::sendSpecialPacket(Node* node) { void ParticleServer::pruneDeletedParticles() { ParticleTree* tree = static_cast(_tree); - if (tree && tree->hasAnyDeletedParticles()) { + if (tree->hasAnyDeletedParticles()) { //qDebug() << "there are some deleted particles to consider..."; uint64_t earliestLastDeletedParticlesSent = usecTimestampNow() + 1; // in the future diff --git a/libraries/particles/src/ParticleTree.cpp b/libraries/particles/src/ParticleTree.cpp index 5e5fa77857..a3c8072b3a 100644 --- a/libraries/particles/src/ParticleTree.cpp +++ b/libraries/particles/src/ParticleTree.cpp @@ -398,9 +398,7 @@ void ParticleTree::forgetParticlesDeletedBefore(uint64_t sinceTime) { //qDebug() << "YES older... time/key:" << iterator.key(); _recentlyDeletedParticleIDs.remove(iterator.key()); } - if (iterator != _recentlyDeletedParticleIDs.constEnd()) { - ++iterator; - } + ++iterator; } _recentlyDeletedParticlesLock.unlock(); } From 54faeae13e25fbded71a36a37c8c705f0abcf360 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 24 Jan 2014 09:51:06 -0800 Subject: [PATCH 3/4] fix windows builds --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0a03036ff..a583d7d951 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,11 @@ ENDIF(APPLE) # targets not supported on windows if (NOT WIN32) add_subdirectory(animation-server) +add_subdirectory(data-server) endif (NOT WIN32) # targets on all platforms add_subdirectory(assignment-client) -add_subdirectory(data-server) add_subdirectory(domain-server) add_subdirectory(interface) add_subdirectory(pairing-server) From 692358bf6ef258078e4feb4ccbf6f546f71d52e8 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 24 Jan 2014 09:51:17 -0800 Subject: [PATCH 4/4] fix windows builds --- interface/src/ui/UpdateDialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp index deb671427f..9919cd0a7b 100644 --- a/interface/src/ui/UpdateDialog.cpp +++ b/interface/src/ui/UpdateDialog.cpp @@ -6,9 +6,8 @@ // Copyright (c) 2013, 2014 High Fidelity, Inc. All rights reserved. // +#include "Application.h" // HACK ATTACK WARNING: for windows build to work, we need this ahead of QtGui #include - -#include "Application.h" #include "ui_updateDialog.h" #include "UpdateDialog.h"