Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -453,23 +453,22 @@ Application::~Application() { · 452 unmodified lines | |||
| 453 | // ask the datagram processing thread to quit and wait until it is done | 453 | // ask the datagram processing thread to quit and wait until it is done |
| 454 | _nodeThread->quit(); | 454 | _nodeThread->quit(); |
| 455 | _nodeThread->wait(); | 455 | _nodeThread->wait(); |
| 456 | |||
| 457 | // kill any audio injectors that are still around | ||
| 458 | AudioScriptingInterface::getInstance().stopAllInjectors(); | ||
| 456 | 459 | ||
| 457 | // stop the audio process | 460 | // stop the audio process |
| 458 | QMetaObject::invokeMethod(&_audio, "stop"); | 461 | QMetaObject::invokeMethod(&_audio, "stop"); |
| 459 | 462 | ||
| 460 | // ask the audio thread to quit and wait until it is done | 463 | // ask the audio thread to quit and wait until it is done |
| 461 | _audio.thread()->quit(); | 464 | _audio.thread()->quit(); |
| 462 | _audio.thread()->wait(); | 465 | _audio.thread()->wait(); |
| 463 | |||
| 464 | // kill any audio injectors that are still around | ||
| 465 | AudioScriptingInterface::getInstance().stopAllInjectors(); | ||
| 466 | 466 | ||
| 467 | _octreeProcessor.terminate(); | 467 | _octreeProcessor.terminate(); |
| 468 | _voxelHideShowThread.terminate(); | 468 | _voxelHideShowThread.terminate(); |
| 469 | _voxelEditSender.terminate(); | 469 | _voxelEditSender.terminate(); |
| 470 | _entityEditSender.terminate(); | 470 | _entityEditSender.terminate(); |
| 471 | 471 | ||
| 472 | |||
| 473 | VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown | 472 | VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown |
| 474 | Menu::getInstance()->deleteLater(); | 473 | Menu::getInstance()->deleteLater(); |
| 475 | 474 | ||