History

Merge branch 'master' of https://github.com/highfidelity/hifi into temp0

Sam Gateau committed 12 years ago

Commit b0189ef2 parents 820c079 843aaf441 files · +780 −378Browse files

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

Unified · Split

interface/src/Application.cpp+3−0
@@ -451,6 +451,9 @@ Application::~Application() { · 450 unmodified lines
451 _audio.thread()->quit();451 _audio.thread()->quit();
452 _audio.thread()->wait();452 _audio.thread()->wait();
453 453
454 // kill any audio injectors that are still around
455 AudioScriptingInterface::getInstance().stopAllInjectors();
456
454 _octreeProcessor.terminate();457 _octreeProcessor.terminate();
455 _voxelHideShowThread.terminate();458 _voxelHideShowThread.terminate();
456 _voxelEditSender.terminate();459 _voxelEditSender.terminate();

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