fixed memory leak with new game picker.

ZDoom · Jan 6, 2024 · 905cebf · 905cebf
1 parent 406cb04
commit 905cebf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/source/common/filesystem/source/fs_stringpool.h b/source/common/filesystem/source/fs_stringpool.h
@@ -8,7 +8,7 @@ class StringPool
 	friend class FileSystem;
 	friend class FResourceFile;
 private:
-	StringPool(bool _shared, size_t blocksize = 10*1024) : TopBlock(nullptr), FreeBlocks(nullptr), BlockSize(blocksize), shared(_shared) {}
+	StringPool(bool _shared, size_t blocksize = 10*1024) : TopBlock(nullptr), BlockSize(blocksize), shared(_shared) {}
 public:
 	~StringPool();
 	const char* Strdup(const char*);
@@ -20,7 +20,6 @@ class StringPool
 	Block *AddBlock(size_t size);
 
 	Block *TopBlock;
-	Block *FreeBlocks;
 	size_t BlockSize;
 public:
 	bool shared;

diff --git a/source/common/widgets/widgetresourcedata.cpp b/source/common/widgets/widgetresourcedata.cpp
@@ -12,6 +12,11 @@ void InitWidgetResources(const char* filename)
 		I_FatalError("Unable to open %s", filename);
 }
 
+void CloseWidgetResources()
+{
+	if (WidgetResources) delete WidgetResources;
+}
+
 static std::vector<uint8_t> LoadFile(const std::string& name)
 {
 	auto lump = WidgetResources->FindEntry(name.c_str());

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
@@ -90,6 +90,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 void LoadHexFont(const char* filename);
 void InitWidgetResources(const char* basewad);
+void CloseWidgetResources();
 
 CVAR(Bool, autoloadlights, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Bool, autoloadbrightmaps, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
@@ -1050,6 +1051,7 @@ int RunGame()
 	GetGames();
 	auto usedgroups = SetupGame();
 
+	CloseWidgetResources();
 	V_InitScreenSize();
 	V_InitScreen();
 	V_Init2();