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
14271427 // let the avatar mixer know we're out
14281428 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
14291429
1430− printf("");
1430+ //printf("");
14311431 _voxelProcessor.terminate();
14321432 _voxelHideShowThread.terminate();
14331433 _voxelEditSender.terminate();
14341434 _particleEditSender.terminate();
14351435 if (_persistThread) {
14361436 _persistThread->terminate();
1437+ _persistThread->deleteLater();
14371438 _persistThread = NULL;
14381439 }
14391440 }
@@ -4395,6 +4396,7 @@ void Application::updateLocalOctreeCache(bool firstTime) { · 2955 unmodified lines
43954396
43964397 if (_persistThread) {
43974398 _persistThread->terminate();
4399+ _persistThread->deleteLater();
43984400 _persistThread = NULL;
43994401 }
44004402

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