Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-02 19:55:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix debug asserts on shutdown

Browse source
This commit is contained in:
Atlante45 2017-07-07 17:01:07 -07:00
parent 0778fbaea9
commit aa306c3450
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/Agent.cpp
View file

@ -801,6 +801,7 @@ void Agent::aboutToFinish() {
emit stopAvatarAudioTimer(); emit stopAvatarAudioTimer();
_avatarAudioTimerThread.quit(); _avatarAudioTimerThread.quit();
_avatarAudioTimerThread.wait();
// cleanup codec & encoder // cleanup codec & encoder
if (_codec && _encoder) { if (_codec && _encoder) {

6
assignment-client/src/entities/EntityServer.cpp
View file

@ -50,6 +50,12 @@ EntityServer::~EntityServer() {
tree->removeNewlyCreatedHook(this); tree->removeNewlyCreatedHook(this);
} }
void EntityServer::aboutToFinish() {
DependencyManager::get<ResourceManager>()->cleanup();
OctreeServer::aboutToFinish();
}
void EntityServer::handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void EntityServer::handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
if (_octreeInboundPacketProcessor) { if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->queueReceivedPacket(message, senderNode); _octreeInboundPacketProcessor->queueReceivedPacket(message, senderNode);

2
assignment-client/src/entities/EntityServer.h
View file

@ -59,6 +59,8 @@ public:
virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& sessionID) override; virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& sessionID) override;
virtual void trackViewerGone(const QUuid& sessionID) override; virtual void trackViewerGone(const QUuid& sessionID) override;
virtual void aboutToFinish() override;
public slots: public slots:
virtual void nodeAdded(SharedNodePointer node) override; virtual void nodeAdded(SharedNodePointer node) override;
virtual void nodeKilled(SharedNodePointer node) override; virtual void nodeKilled(SharedNodePointer node) override;