From 388b3f0296f0a55b40017c5a1ad2b722218bd8a9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 16 Aug 2008 22:30:47 +0000
Subject: Properly close files opened when checking for config file on WIN32.

svn-id: r33953
---
 backends/platform/sdl/sdl.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 5c3b87309d..539b34b78b 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -292,12 +292,13 @@ static Common::String getDefaultConfigFileName() {
 		CreateDirectory(configFile, NULL);
 		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
 
-		if (fopen(configFile, "r") == NULL) {
+		FILE *tmp = NULL;
+		if ((tmp = fopen(configFile, "r")) == NULL) {
 			// Check windows directory
 			char oldConfigFile[MAXPATHLEN];
 			GetWindowsDirectory(oldConfigFile, MAXPATHLEN);
 			strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE);
-			if (fopen(oldConfigFile, "r")) {
+			if ((tmp = fopen(oldConfigFile, "r"))) {
 				printf("The default location of the config file (scummvm.ini) in ScummVM has changed,\n");
 				printf("under Windows NT4/2000/XP/Vista. You may want to consider moving your config\n");
 				printf("file from the old default location:\n");
@@ -305,7 +306,11 @@ static Common::String getDefaultConfigFileName() {
 				printf("to the new default location:\n");
 				printf("%s\n\n", configFile);
 				strcpy(configFile, oldConfigFile);
+
+				fclose(tmp);
 			}
+		} else {
+			fclose(tmp);
 		}
 	} else {
 		// Check windows directory
-- 
cgit v1.2.3