From ababfe05531158ac27fb14064b64b1c3a3ef0e46 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 19 Jun 2016 20:48:30 +0200
Subject: [PATCH] Changed: Init CSystemUtils in INelContext

---
 code/nel/src/misc/app_context.cpp | 7 +++++++
 code/ryzom/client/src/init.cpp    | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/nel/src/misc/app_context.cpp b/code/nel/src/misc/app_context.cpp
index 5206681f9..68ca720ed 100644
--- a/code/nel/src/misc/app_context.cpp
+++ b/code/nel/src/misc/app_context.cpp
@@ -18,6 +18,7 @@
 #include "nel/misc/app_context.h"
 #include "nel/misc/dynloadlib.h"
 #include "nel/misc/command.h"
+#include "nel/misc/system_utils.h"
 
 #include <locale.h>
 
@@ -71,6 +72,9 @@ INelContext::~INelContext()
 
 	CInstanceCounterLocalManager::releaseInstance();
 
+	// uninit some systems stuff
+	CSystemUtils::uninit();
+
 	_NelContext = NULL;
 	*(_getInstance()) = NULL;
 }
@@ -90,6 +94,9 @@ void INelContext::contextReady()
 	// set numeric locale to C to avoid the use of decimal separators different of a dot
 	char *locale = setlocale(LC_NUMERIC, "C");
 
+	// init some systems stuff
+	CSystemUtils::init();
+
 	// register any pending thinks
 
 	// register local instance counter in the global instance counter manager
diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 666e86760..ffc6aa308 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -1154,7 +1154,6 @@ void prelogInit()
 			Driver->setSwapVBLInterval(0);
 
 		// initialize system utils class
-		CSystemUtils::init();
 		CSystemUtils::setWindow(Driver->getDisplay());
 
 		CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_VideoModeSetupHighColor, "login_step_video_mode_setup_high_color"));