From e88a317f428b61ab8361fe158ad3f9e77d65dea5 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 15 Oct 2016 17:11:53 +0200
Subject: [PATCH] Fixed: Deadlock while calling CoUninitialize()

---
 code/nel/src/misc/app_context.cpp | 6 ------
 code/ryzom/client/src/init.cpp    | 1 +
 code/ryzom/client/src/release.cpp | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/code/nel/src/misc/app_context.cpp b/code/nel/src/misc/app_context.cpp
index 68ca720ed..6bf2d10e1 100644
--- a/code/nel/src/misc/app_context.cpp
+++ b/code/nel/src/misc/app_context.cpp
@@ -72,9 +72,6 @@ INelContext::~INelContext()
 
 	CInstanceCounterLocalManager::releaseInstance();
 
-	// uninit some systems stuff
-	CSystemUtils::uninit();
-
 	_NelContext = NULL;
 	*(_getInstance()) = NULL;
 }
@@ -94,9 +91,6 @@ 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 f3935eed4..240a70068 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -1148,6 +1148,7 @@ 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"));
diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp
index da456fadb..dd1986174 100644
--- a/code/ryzom/client/src/release.cpp
+++ b/code/ryzom/client/src/release.cpp
@@ -556,6 +556,7 @@ void release()
 
 	// restore screensaver state
 	CSystemUtils::enableScreensaver(LastScreenSaverEnabled);
+	CSystemUtils::uninit();
 
 	// release PACS primitives
 	deletePrimitiveBlocks();
@@ -663,9 +664,6 @@ void release()
 	NLGUI::CDBManager::release();
 	CWidgetManager::release();
 
-
-
-
 #if FINAL_VERSION
 	// openURL ("http://www.ryzomcore.org/exit/");
 #endif