From 13d7715c4116bfd66ecd9fd2cc7bbc4763bf6781 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Fri, 29 Jul 2016 15:15:51 -0700
Subject: [PATCH] Prevent deadlock on changing plugins

---
 libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp b/libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp
index 188af56ca2..6ae4d07a25 100644
--- a/libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp
+++ b/libraries/ui-plugins/src/ui-plugins/PluginContainer.cpp
@@ -8,6 +8,7 @@
 #include "PluginContainer.h"
 
 #include <QtCore/QTimer>
+#include <QtCore/QThread>
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
@@ -162,6 +163,8 @@ void PluginContainer::setBoolSetting(const QString& settingName, bool value) {
 }
 
 bool isRenderThread() {
+    return QThread::currentThread() != qApp->thread();
+    // FIXME causes a deadlock on switching display plugins
     auto displayPlugin = PluginContainer::getInstance().getActiveDisplayPlugin();
     return displayPlugin && displayPlugin->isRenderThread();
 }
\ No newline at end of file