From 399517fcbd54ab7a6c6825bd9360528421b32023 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 6 Jun 2016 13:27:58 -0700
Subject: [PATCH] Activate Inputs after menus are setup

---
 interface/src/Application.cpp                   | 10 +++++++++-
 libraries/plugins/src/plugins/PluginManager.cpp |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ed212dade5..68e916c29e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -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;
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 6bff5a36f3..7161132c5e 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -175,7 +175,6 @@ const InputPluginList& PluginManager::getInputPlugins() {
         for (auto plugin : inputPlugins) {
             plugin->setContainer(&container);
             plugin->init();
-            plugin->activate();
         }
     });
     return inputPlugins;