Merge pull request #15845 from SamGondelman/threadpool

BUGZ-861: Wait on QThreadPool threads on shutdown
This commit is contained in:
Shannon Romano 2019-06-27 08:42:06 -07:00 committed by GitHub
commit 417e02ac9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2712,6 +2712,7 @@ void Application::cleanupBeforeQuit() {
// Clear any queued processing (I/O, FBX/OBJ/Texture parsing)
QThreadPool::globalInstance()->clear();
QThreadPool::globalInstance()->waitForDone();
DependencyManager::destroy<RecordingScriptingInterface>();