Fix for crash on exit.

This commit is contained in:
Andrzej Kapolka 2014-10-27 15:01:06 -07:00
parent 15f8b3006b
commit 7bcc267cb5
2 changed files with 8 additions and 0 deletions

View file

@ -48,6 +48,12 @@ MetavoxelSystem::NetworkSimulation::NetworkSimulation(float dropRate, float repe
bandwidthLimit(bandwidthLimit) { bandwidthLimit(bandwidthLimit) {
} }
MetavoxelSystem::~MetavoxelSystem() {
// kill the updater before we delete our network simulation objects
_updater->thread()->quit();
_updater->thread()->wait();
}
void MetavoxelSystem::init() { void MetavoxelSystem::init() {
MetavoxelClientManager::init(); MetavoxelClientManager::init();
DefaultMetavoxelRendererImplementation::init(); DefaultMetavoxelRendererImplementation::init();

View file

@ -43,6 +43,8 @@ public:
int maximumDelay = 0, int bandwidthLimit = 0); int maximumDelay = 0, int bandwidthLimit = 0);
}; };
virtual ~MetavoxelSystem();
virtual void init(); virtual void init();
virtual MetavoxelLOD getLOD(); virtual MetavoxelLOD getLOD();