Fixed: Deadlock while calling CoUninitialize()
--HG-- branch : develop
This commit is contained in:
parent
0f8a397408
commit
85c2535a1f
3 changed files with 2 additions and 9 deletions
|
@ -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
|
||||
|
|
|
@ -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"));
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue