aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 15:16:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Release CCurrentCoTask singleton

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-09 16:14:16 +01:00
parent 06cc0ddec8
commit eabfcbf708
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/misc/co_task.h
View file

@ -201,7 +201,9 @@ namespace NLMISC
*/ */
void sleep(uint milliseconds); void sleep(uint milliseconds);
/** Release internal instance.
*/
static void releaseInstance();
}; };

15
code/nel/src/misc/co_task.cpp
View file

@ -213,6 +213,16 @@ namespace NLMISC
return _ThreadMainFiber.getPointer(); return _ThreadMainFiber.getPointer();
} }
#endif #endif
static void releaseInstance()
{
if (_Instance)
{
NLMISC::INelContext::getInstance().releaseSingletonPointer("CCurrentCoTask", _Instance);
delete _Instance;
_Instance = NULL;
}
}
}; };
NLMISC_SAFE_SINGLETON_IMPL(CCurrentCoTask); NLMISC_SAFE_SINGLETON_IMPL(CCurrentCoTask);
@ -560,5 +570,10 @@ namespace NLMISC
} }
} }
void CCoTask::releaseInstance()
{
CCurrentCoTask::releaseInstance();
}
} // namespace NLMISC } // namespace NLMISC

1
code/ryzom/client/src/release.cpp
View file

@ -669,6 +669,7 @@ void release()
CWidgetManager::release(); CWidgetManager::release();
CViewRenderer::release(); CViewRenderer::release();
CIXml::releaseLibXml(); CIXml::releaseLibXml();
CCoTask::releaseInstance();
#if FINAL_VERSION #if FINAL_VERSION
// openURL ("http://www.ryzomcore.org/exit/"); // openURL ("http://www.ryzomcore.org/exit/");