From 960017ddd704cfa77321a1edcc6df25e91330595 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Sat, 24 Jun 2017 22:22:47 -0700
Subject: [PATCH] Fix static plugin initialization on Linux

---
 interface/src/Application.cpp                   | 10 +++++-----
 libraries/plugins/src/plugins/PluginManager.cpp |  4 ----
 libraries/plugins/src/plugins/PluginManager.h   | 17 ++++++++---------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c80626ad5c..0951e0973b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -486,11 +486,11 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     Setting::init();
 
     // Tell the plugin manager about our statically linked plugins
-    PluginManager::setInputPluginProvider([] { return getInputPlugins(); });
-    PluginManager::setDisplayPluginProvider([] { return getDisplayPlugins(); });
-    PluginManager::setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
-
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+    auto pluginManager = PluginManager::getInstance();
+    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
+    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
+    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
+    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
         steamClient->init();
     }
 
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index e90d3e3a0f..18ac905ef1 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -23,10 +23,6 @@
 #include "InputPlugin.h"
 #include "PluginLogging.h"
 
-DisplayPluginProvider PluginManager::_displayPluginProvider = []()->DisplayPluginList { return {}; };
-InputPluginProvider PluginManager::_inputPluginProvider = []()->InputPluginList { return {}; };
-CodecPluginProvider PluginManager::_codecPluginProvider = []()->CodecPluginList { return {}; };
-InputPluginSettingsPersister PluginManager::_inputSettingsPersister = [](const InputPluginList& list) {};
 
 void PluginManager::setDisplayPluginProvider(const DisplayPluginProvider& provider) {
     _displayPluginProvider = provider;
diff --git a/libraries/plugins/src/plugins/PluginManager.h b/libraries/plugins/src/plugins/PluginManager.h
index cb011392a4..08fe4fde20 100644
--- a/libraries/plugins/src/plugins/PluginManager.h
+++ b/libraries/plugins/src/plugins/PluginManager.h
@@ -33,16 +33,15 @@ public:
     void shutdown();
 
     // Application that have statically linked plugins can expose them to the plugin manager with these function
-    static void setDisplayPluginProvider(const DisplayPluginProvider& provider);
-    static void setInputPluginProvider(const InputPluginProvider& provider);
-    static void setCodecPluginProvider(const CodecPluginProvider& provider);
-    static void setInputPluginSettingsPersister(const InputPluginSettingsPersister& persister);
+    void setDisplayPluginProvider(const DisplayPluginProvider& provider);
+    void setInputPluginProvider(const InputPluginProvider& provider);
+    void setCodecPluginProvider(const CodecPluginProvider& provider);
+    void setInputPluginSettingsPersister(const InputPluginSettingsPersister& persister);
     
 private:
-    static DisplayPluginProvider _displayPluginProvider;
-    static InputPluginProvider _inputPluginProvider;  
-    static CodecPluginProvider _codecPluginProvider;
-    static InputPluginSettingsPersister _inputSettingsPersister;
-
+    DisplayPluginProvider _displayPluginProvider { []()->DisplayPluginList { return {}; } };
+    InputPluginProvider _inputPluginProvider { []()->InputPluginList { return {}; } };
+    CodecPluginProvider _codecPluginProvider { []()->CodecPluginList { return {}; } };
+    InputPluginSettingsPersister _inputSettingsPersister { [](const InputPluginList& list) {} };
     PluginContainer* _container { nullptr };
 };