[Scummvm-cvs-logs] SF.net SVN: scummvm: [28952] scummvm/trunk/common/file.cpp

[lordhoto at users.sourceforge.net]

Revision: 28952
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28952&view=rev
Author:   lordhoto
Date:     2007-09-18 16:07:27 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
Fixes Common::File::exists. Please see the added FIXME comment about the real problem.

Modified Paths:
--------------
    scummvm/trunk/common/file.cpp

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2007-09-18 23:05:33 UTC (rev 28951)
+++ scummvm/trunk/common/file.cpp	2007-09-18 23:07:27 UTC (rev 28952)
@@ -444,7 +444,13 @@
 	// path was passed). But we only use this to filter out directories.
 	FilesystemNode file(filename);
 	
-	return (!file.isDirectory() && file.exists());
+	// FIXME: since (as stated in the comment above) FilesystemNode creation
+	// just works for absolute paths, and we use this to tell if a file
+	// exsists in any of the setup paths we can't use:
+	//return (!file.isDirectory() && file.exists());
+	// if file.exsits() fails
+	if (file.exists())
+		return !file.isDirectory();
 	
 	//***DEPRECATED COMMENTS BELOW, LEFT FOR DISCUSSION***
 	// Next, try to locate the file by *opening* it in read mode. This has


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.