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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Sep 7 23:47:46 CEST 2008


Revision: 34430
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34430&view=rev
Author:   fingolfin
Date:     2008-09-07 21:47:46 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Made File::addDefaultDirectory(Recursive) ignore FSNodes which are not dirs / are invalid, instead of erroring out

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

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2008-09-07 21:47:01 UTC (rev 34429)
+++ scummvm/trunk/common/file.cpp	2008-09-07 21:47:46 UTC (rev 34430)
@@ -114,7 +114,7 @@
 }
 
 void File::addDefaultDirectoryRecursive(const FilesystemNode &dir, int level, const String &prefix) {
-	if (level <= 0)
+	if (level <= 0 || !dir.exists() || !dir.isDirectory())
 		return;
 
 	FSList fslist;


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