[Scummvm-cvs-logs] SF.net SVN: scummvm:[33953] scummvm/trunk/backends/platform/sdl/sdl.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Aug 17 00:30:48 CEST 2008
Revision: 33953
http://scummvm.svn.sourceforge.net/scummvm/?rev=33953&view=rev
Author: lordhoto
Date: 2008-08-16 22:30:47 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
Properly close files opened when checking for config file on WIN32.
Modified Paths:
--------------
scummvm/trunk/backends/platform/sdl/sdl.cpp
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-08-16 22:30:19 UTC (rev 33952)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-08-16 22:30:47 UTC (rev 33953)
@@ -292,12 +292,13 @@
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 @@
printf("to the new default location:\n");
printf("%s\n\n", configFile);
strcpy(configFile, oldConfigFile);
+
+ fclose(tmp);
}
+ } else {
+ fclose(tmp);
}
} else {
// Check windows directory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list