[Scummvm-git-logs] scummvm master -> 1402a78a019eec4d4d73335505b65e7b3e2c067c

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1402a78a01 Revert "GUI: Fix memory leak"


Commit: 1402a78a019eec4d4d73335505b65e7b3e2c067c
    https://github.com/scummvm/scummvm/commit/1402a78a019eec4d4d73335505b65e7b3e2c067c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-15T10:00:18+01:00

Commit Message:
Revert "GUI: Fix memory leak"

I suspect the file object is used later, so I can't delete it here.

This reverts commit c7f4d96a9d28ae24cbfa343b95b3a7babad34421.

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index e875311084..ca3810841b 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -153,10 +153,9 @@ void GuiManager::initIconsSet() {
 	if (file->isOpen())
 		dat = Common::makeZipArchive(file);
 
-	delete file;
-
 	if (!dat) {
 		warning("GUI: Could not find '%s'", fname);
+		delete file;
 		return;
 	}