From 438893ad585aa4c9ae88f2175ce98bc79ab8b276 Mon Sep 17 00:00:00 2001
From: ksuprynowicz <ksuprynowicz@post.pl>
Date: Wed, 8 Nov 2023 18:49:34 +0100
Subject: [PATCH] Revert "Merge pull request #705 from
 daleglass-overte/fix-plugin-crash"

This reverts commit d1cbfa88381e4734607b7be5b8e4f0104d10d03f, reversing
changes made to 665d21210afc01ad704a99f7440a0e93235a833b.
---
 interface/src/Application.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2ea558c9ae5..37204b0f9b9 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -763,7 +763,19 @@ bool setupEssentials(int& argc, char** argv, const QCommandLineParser& parser, b
         }
     }
 
-
+    // Tell the plugin manager about our statically linked plugins
+    DependencyManager::set<ScriptInitializers>();
+    DependencyManager::set<PluginManager>();
+    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();
+    }
+    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
+        oculusPlatform->init();
+    }
 
     PROFILE_SET_THREAD_NAME("Main Thread");
 
@@ -8751,21 +8763,6 @@ void Application::sendLambdaEvent(const std::function<void()>& f) {
 }
 
 void Application::initPlugins(const QCommandLineParser& parser) {
-    // Tell the plugin manager about our statically linked plugins
-    DependencyManager::set<ScriptInitializers>();
-    DependencyManager::set<PluginManager>();
-    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();
-    }
-    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
-        oculusPlatform->init();
-    }
-
-
     if (parser.isSet("display")) {
         auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
         qInfo() << "Setting prefered display plugins:" << preferredDisplays;