Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Activate Inputs after menus are setup

Browse source
This commit is contained in:
Atlante45 2016-06-06 13:27:58 -07:00
parent 26acc6fd8b
commit 399517fcbd
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -2951,7 +2951,8 @@ void Application::loadSettings() {
Menu::getInstance()->loadSettings();
// If there is a preferred plugin, we probably messed it up with the menu settings, so fix it.
auto plugins = PluginManager::getInstance()->getPreferredDisplayPlugins();
auto pluginManager = PluginManager::getInstance();
auto plugins = pluginManager->getPreferredDisplayPlugins();
for (auto plugin : plugins) {
auto menu = Menu::getInstance();
if (auto action = menu->getActionForOption(plugin->getName())) {
@ -2962,6 +2963,13 @@ void Application::loadSettings() {
}
}
auto inputs = pluginManager->getInputPlugins();
for (auto plugin : inputs) {
if (!plugin->isActive()) {
plugin->activate();
}
}
getMyAvatar()->loadData();
_settingsLoaded = true;

1
libraries/plugins/src/plugins/PluginManager.cpp
View file

@ -175,7 +175,6 @@ const InputPluginList& PluginManager::getInputPlugins() {
for (auto plugin : inputPlugins) {
plugin->setContainer(&container);
plugin->init();
plugin->activate();
}
});
return inputPlugins;