From 6a0b479041f1f96356f1a7ab260b47211627ca0d Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 16 May 2019 10:48:18 -0700
Subject: [PATCH] Fix warning and build failures

---
 .../src/scripting/WindowScriptingInterface.cpp   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index e1272d68a7..3194fa24eb 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -611,28 +611,23 @@ float WindowScriptingInterface::domainLoadingProgress() {
     return qApp->getOctreePacketProcessor().domainLoadingProgress();
 }
 
-const DisplayPluginList& getDisplayPlugins() {
-    static const auto& list = PluginManager::getInstance()->getDisplayPlugins();
-    return list;
-}
-
 int WindowScriptingInterface::getDisplayPluginCount() {
-    return getDisplayPlugins().size();
+    return (int)PluginManager::getInstance()->getDisplayPlugins().size();
 }
 
 QString WindowScriptingInterface::getDisplayPluginName(int index) {
-    return getDisplayPlugins().at(index)->getName();
+    return PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
 }
 
 bool WindowScriptingInterface::isDisplayPluginHmd(int index) {
-    return getDisplayPlugins().at(index)->isHmd();
+    return PluginManager::getInstance()->getDisplayPlugins().at(index)->isHmd();
 }
 
 int WindowScriptingInterface::getActiveDisplayPlugin() {
     auto active = qApp->getActiveDisplayPlugin();
     auto size = getDisplayPluginCount();
     for (int i = 0; i < size; ++i) {
-        if (getDisplayPlugins().at(i) == active) {
+        if (PluginManager::getInstance()->getDisplayPlugins().at(i) == active) {
             return i;
         }
     }
@@ -640,5 +635,6 @@ int WindowScriptingInterface::getActiveDisplayPlugin() {
 }
 
 void WindowScriptingInterface::setActiveDisplayPlugin(int index) {
-    qApp->setActiveDisplayPlugin(getDisplayPlugins().at(index)->getName());
+    auto name = PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
+    qApp->setActiveDisplayPlugin(name);
 }