History

Merge branch 'master' of https://github.com/highfidelity/hifi into orange

Sam Gateau committed 9 years ago

Commit 75e457c2 parents 77650ac 9ae390845 files · +1329 −421Browse files

Showing the changes to interface/src/Application.cpp (1 of 45 files). Show all

Unified · Split

interface/src/Application.cpp+5−5
@@ -483,11 +483,11 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 482 unmodified lines
483 Setting::init();483 Setting::init();
484 484
485 // Tell the plugin manager about our statically linked plugins485 // Tell the plugin manager about our statically linked plugins
486 PluginManager::setInputPluginProvider([] { return getInputPlugins(); });486 auto pluginManager = PluginManager::getInstance();
487 PluginManager::setDisplayPluginProvider([] { return getDisplayPlugins(); });487 pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
488 PluginManager::setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });488 pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
489 489 pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
490 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {490 if (auto steamClient = pluginManager->getSteamClientPlugin()) {
491 steamClient->init();491 steamClient->init();
492 }492 }
493 493