[Scummvm-cvs-logs] SF.net SVN: scummvm:[36043] scummvm/branches/branch-0-13-0/backends/fs/psp/ psp-fs.cpp

[joostp at users.sourceforge.net]

Revision: 36043
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36043&view=rev
Author:   joostp
Date:     2009-01-24 20:59:53 +0000 (Sat, 24 Jan 2009)

Log Message:
-----------
don't append '/' to path in getChildren() (from trunk)

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/backends/fs/psp/psp-fs.cpp

Modified: scummvm/branches/branch-0-13-0/backends/fs/psp/psp-fs.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/backends/fs/psp/psp-fs.cpp	2009-01-24 20:46:20 UTC (rev 36042)
+++ scummvm/branches/branch-0-13-0/backends/fs/psp/psp-fs.cpp	2009-01-24 20:59:53 UTC (rev 36043)
@@ -129,13 +129,15 @@
 
 			entry._isValid = true;
 			entry._displayName = dir.d_name;
-			entry._path = _path;
-			entry._path += dir.d_name;
+
+			Common::String newPath(_path);
+			if (newPath.lastChar() != '/')
+				newPath += '/';
+			newPath += dir.d_name;
+
+			entry._path = newPath;
 			entry._isDirectory = dir.d_stat.st_attr & FIO_SO_IFDIR;
 
-			if (entry._isDirectory)
-				entry._path += "/";
-
 			// Honor the chosen mode
 			if ((mode == Common::FSNode::kListFilesOnly && entry._isDirectory) ||
 			   (mode == Common::FSNode::kListDirectoriesOnly && !entry._isDirectory))


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