From 546799874e129590576ae260032a75a10d16c1b6 Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985.arcemu@gmail.com>
Date: Sun, 12 Feb 2012 02:18:00 +0100
Subject: [PATCH] We might as well load the input config when we initialize the
 input handler.

--HG--
branch : gui-refactoring
---
 code/ryzom/client/src/init.cpp                           | 4 ++++
 code/ryzom/client/src/interface_v3/interface_manager.cpp | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 1721164e7..e9d60774e 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -1071,6 +1071,10 @@ void prelogInit()
 		CInputHandlerManager *InputHandlerManager = CInputHandlerManager::getInstance();
 		InputHandlerManager->addToServer (&Driver->EventServer);
 
+		std::string filename = CPath::lookup( ClientCfg.XMLInputFile, false );
+		if( !filename.empty() )
+			InputHandlerManager->readInputConfigFile( filename );
+
 		// Create a text context. We need to put the full path because we not already add search path
 //		resetTextContext ("bremenb.ttf", false);
 		resetTextContext ("ryzom.ttf", false);
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index f3b8d27d4..3e665e7ba 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -297,13 +297,6 @@ _ViewRenderer( driver, textcontext )
 	// Global initialization
 	// *********************
 
-
-	//init the input handler through the parsing of a config file
-	CInputHandlerManager *InputHandlerManager = CInputHandlerManager::getInstance();
-	string filename = CPath::lookup(ClientCfg.XMLInputFile, false);
-	if (!filename.empty())
-		InputHandlerManager->readInputConfigFile(filename);
-
 	// Interface Manager init
 	_ViewRenderer.checkNewScreenSize();
 	_ViewRenderer.init();