From 77741c28514c7197d8880288b5a61be0aa327853 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 16:43:15 -0800
Subject: [PATCH] Fix for deadlock triggering while loading QML engine

---
 interface/src/Application.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3e7dd3e223..c22a370b1f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2404,7 +2404,9 @@ void Application::initializeUi() {
         tabletScriptingInterface->getTablet(SYSTEM_TABLET);
     }
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    DeadlockWatchdogThread::pause();
     offscreenUi->create();
+    DeadlockWatchdogThread::resume();
 
     auto surfaceContext = offscreenUi->getSurfaceContext();