Implement a more robust cleanup strategy (#11)

TeddiO · Nov 10, 2024 · deffd88 · deffd88
1 parent 25bd7aa
commit deffd88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/fwens.cpp b/src/fwens.cpp
@@ -27,6 +27,15 @@ Fwens* Fwens::GetInstance()
 	return instance;
 }
 
+void Fwens::Destroy()
+{
+	if (instance != NULL) 
+	{
+		delete instance;
+		instance = NULL;
+	}
+}
+
 void Fwens::SetLuaInstance(GarrysMod::Lua::ILuaBase* ILuaBase)
 {
 	LUA = ILuaBase;

diff --git a/src/fwens.h b/src/fwens.h
@@ -13,11 +13,12 @@ class Fwens
 public:
 	~Fwens();
 	static Fwens* GetInstance();
+	static void Destroy();
 	void InitSteamAPIConnection();
 	bool GetSteamContextActive();
 	void SetLuaInstance(GarrysMod::Lua::ILuaBase* ILuaBase);
 	void RequestUserGroupStatus(CSteamID player, CSteamID groupID);
-	void ClearSteamContext();	
+	void ClearSteamContext();
 	void NotifyLuaSteamConnectionEvent(bool connected);
 
 	STEAM_GAMESERVER_CALLBACK(Fwens, Steam_HandleSteamConnected, SteamServersConnected_t, m_steamcallback_HandleConnected);

diff --git a/src/main.cpp b/src/main.cpp
@@ -85,10 +85,7 @@ GMOD_MODULE_OPEN()
 
 GMOD_MODULE_CLOSE()
 {
-#ifdef _WIN32
-	Fwens* fwenVar = Fwens::GetInstance();
-	delete fwenVar;
-#endif
+	Fwens::Destroy();
 	return 0;
 }