Fixed: Crash in CLuaManager

--HG--
branch : develop

code/nel/include/nel/gui/lua_manager.h

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

code/nel/src/gui/lua_manager.cpp

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

code/ryzom/client/src/release.cpp

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