Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12368 from jherico/fix/offscreen_deadlock

Browse source 
Fix for deadlock triggering while loading QML engine
This commit is contained in:
John Conklin II 2018-02-08 10:37:46 -08:00 committed by GitHub
commit d0cfdfb4ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -2404,7 +2404,9 @@ void Application::initializeUi() {
tabletScriptingInterface->getTablet(SYSTEM_TABLET); tabletScriptingInterface->getTablet(SYSTEM_TABLET);
} }
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
DeadlockWatchdogThread::pause();
offscreenUi->create(); offscreenUi->create();
DeadlockWatchdogThread::resume();
auto surfaceContext = offscreenUi->getSurfaceContext(); auto surfaceContext = offscreenUi->getSurfaceContext();