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(); + DependencyManager::set(); + 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& f) { } void Application::initPlugins(const QCommandLineParser& parser) { - // Tell the plugin manager about our statically linked plugins - DependencyManager::set(); - DependencyManager::set(); - 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;