[Agents] Constructors shouldn't have side effects

2 files changed, 5 insertions, 3 deletions

diff --git a/xbmc/games/agents/input/AgentController.cpp b/xbmc/games/agents/input/AgentController.cpp
index a52921979c..e70f4fa10c 100644
--- a/xbmc/games/agents/input/AgentController.cpp
+++ b/xbmc/games/agents/input/AgentController.cpp
@@ -43,8 +43,6 @@ CAgentController::CAgentController(PERIPHERALS::PeripheralPtr peripheral)
     default:
       break;
   }
-
-  Initialize();
 }
 
 CAgentController::~CAgentController()
diff --git a/xbmc/games/agents/input/AgentInput.cpp b/xbmc/games/agents/input/AgentInput.cpp
index afef2afe8d..099f0a7cce 100644
--- a/xbmc/games/agents/input/AgentInput.cpp
+++ b/xbmc/games/agents/input/AgentInput.cpp
@@ -439,7 +439,11 @@ void CAgentInput::ProcessAgentControllers(const PERIPHERALS::PeripheralVector& p
     if (it == m_controllers.end())
     {
       // Handle new controller
-      m_controllers.emplace_back(std::make_shared<CAgentController>(peripheral));
+      std::shared_ptr<CAgentController> agentController =
+          std::make_shared<CAgentController>(peripheral);
+      agentController->Initialize();
+      m_controllers.emplace_back(std::move(agentController));
+
       SetChanged(true);
     }
     else