From 3158439cba430f8662cf45652afbec1b6ed25082 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 6 Oct 2016 15:44:24 -0700
Subject: [PATCH] Prevent deadlock when rapidly switching between openvr and
 desktop mode

---
 .../src/display-plugins/hmd/HmdDisplayPlugin.cpp                | 1 -
 libraries/shared/src/LogHandler.h                               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 86322edded..70535e7a0a 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -124,7 +124,6 @@ void HmdDisplayPlugin::uncustomizeContext() {
         batch.setFramebuffer(_compositeFramebuffer);
         batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(0));
     });
-    internalPresent();
     _overlayRenderer = OverlayRenderer();
     Parent::uncustomizeContext();
 }
diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h
index d346913dd3..5eae57c3b6 100644
--- a/libraries/shared/src/LogHandler.h
+++ b/libraries/shared/src/LogHandler.h
@@ -59,7 +59,7 @@ private:
 
     QString _targetName;
     bool _shouldOutputProcessID { false };
-    bool _shouldOutputThreadID { false };
+    bool _shouldOutputThreadID { true };
     bool _shouldDisplayMilliseconds { false };
     QSet<QString> _repeatedMessageRegexes;
     QHash<QString, int> _repeatMessageCountHash;