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

Fixed: Crash in CLuaManager

Browse source
This commit is contained in:
kervala 2015-11-13 19:18:41 +01:00
parent 6937441713
commit 9bd26052d7
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/include/nel/gui/lua_manager.h
View file

@ -31,8 +31,8 @@ namespace NLGUI
class CLuaManager class CLuaManager
{ {
public: public:
~CLuaManager();
/// Get or create singleton
static CLuaManager& getInstance() static CLuaManager& getInstance()
{ {
if( instance == NULL ) if( instance == NULL )
@ -42,6 +42,9 @@ namespace NLGUI
return *instance; return *instance;
} }
/// Release singleton
static void releaseInstance();
/// Enables attaching the Lua debugger in the CLuaState instance, only matters on startup. /// Enables attaching the Lua debugger in the CLuaState instance, only matters on startup.
static void enableLuaDebugging(){ debugLua = true; } static void enableLuaDebugging(){ debugLua = true; }
@ -65,6 +68,7 @@ namespace NLGUI
private: private:
CLuaManager(); CLuaManager();
~CLuaManager();
static CLuaManager *instance; static CLuaManager *instance;
static bool debugLua; static bool debugLua;

19
code/nel/src/gui/lua_manager.cpp
View file

@ -33,8 +33,20 @@ namespace NLGUI
CLuaManager::~CLuaManager() CLuaManager::~CLuaManager()
{ {
delete luaState; if (luaState)
luaState = NULL; {
delete luaState;
luaState = NULL;
}
}
void CLuaManager::releaseInstance()
{
if (instance)
{
delete instance;
instance = NULL;
}
} }
bool CLuaManager::executeLuaScript( const std::string &luaScript, bool smallScript ) bool CLuaManager::executeLuaScript( const std::string &luaScript, bool smallScript )
@ -60,7 +72,8 @@ namespace NLGUI
void CLuaManager::ResetLuaState() void CLuaManager::ResetLuaState()
{ {
delete luaState; if (luaState) delete luaState;
luaState = new CLuaState( debugLua ); luaState = new CLuaState( debugLua );
} }

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

@ -659,7 +659,7 @@ void release()
CInterfaceExpr::release(); CInterfaceExpr::release();
CPdrTokenRegistry::releaseInstance(); CPdrTokenRegistry::releaseInstance();
NLNET::IModuleManager::releaseInstance(); NLNET::IModuleManager::releaseInstance();
delete &CLuaManager::getInstance(); CLuaManager::releaseInstance();
NLGUI::CDBManager::release(); NLGUI::CDBManager::release();
CWidgetManager::release(); CWidgetManager::release();