History

fixes leak of GenericThread and also fixes crash in octree servers on client disconnect

Brad Hefta-Gaub committed 12 years ago

Commit f97ab1d1 parent b4c963b4 files · +29 −21Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+3−1
@@ -1427,13 +1427,14 @@ void Application::terminate() { · 1426 unmodified lines
1427 // let the avatar mixer know we're out1427 // let the avatar mixer know we're out
1428 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);1428 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
1429 1429
1430 printf("");1430 //printf("");
1431 _voxelProcessor.terminate();1431 _voxelProcessor.terminate();
1432 _voxelHideShowThread.terminate();1432 _voxelHideShowThread.terminate();
1433 _voxelEditSender.terminate();1433 _voxelEditSender.terminate();
1434 _particleEditSender.terminate();1434 _particleEditSender.terminate();
1435 if (_persistThread) {1435 if (_persistThread) {
1436 _persistThread->terminate();1436 _persistThread->terminate();
1437 _persistThread->deleteLater();
1437 _persistThread = NULL;1438 _persistThread = NULL;
1438 }1439 }
1439}1440}
@@ -4395,6 +4396,7 @@ void Application::updateLocalOctreeCache(bool firstTime) { · 2955 unmodified lines
4395 4396
4396 if (_persistThread) {4397 if (_persistThread) {
4397 _persistThread->terminate();4398 _persistThread->terminate();
4399 _persistThread->deleteLater();
4398 _persistThread = NULL;4400 _persistThread = NULL;
4399 }4401 }
4400 4402

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t