Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-24 14:00:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

FIx broken merge

Browse Source
This commit is contained in:
kev :) 2012-11-11 00:47:24 +00:00
parent 476f858388
commit f4ed710420
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/FileSystems/ISOFileSystem.cpp
View File

@ -512,11 +512,7 @@ std::vector<PSPFileInfo> ISOFileSystem::GetDirListing(std::string path)
{
TreeEntry *e = entry->children[i];
<<<<<<< HEAD
if(e->name == "." || e->name == "..") // do not include the relative entries in the list
=======
if(!strcmp(e->name.c_str(), ".") || !strcmp(e->name.c_str(), "..")) // do not include the relative entries in the list
>>>>>>> upstream/master
continue;
PSPFileInfo x;