Skip to content

Commit

Permalink
move mac resource prefix stripping outside of getdirlisting
Browse files Browse the repository at this point in the history
instead let the top level functions calling getdirlisting decide whether or not they want to do this (most already do)
  • Loading branch information
MinaciousGrace committed Feb 8, 2019
1 parent 1fafdad commit 40d7f62
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/RageFileManager.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "global.h"
#include "global.h"
#include "Foreach.h"
#include "LuaManager.h"
#include "RageFile.h"
Expand Down Expand Up @@ -458,11 +458,7 @@ RageFileManager::GetDirListing(const RString& sPath_,
}
}

UnreferenceAllDrivers(apDriverList);

// Remove files that start with ._ from the list because these are special
// OS X files that cause interference on other platforms. -Kyz
StripMacResourceForks(AddTo);
UnreferenceAllDrivers(apDriverList);

if (iDriversThatReturnedFiles > 1) {
/* More than one driver returned files. Remove duplicates
Expand Down Expand Up @@ -1275,6 +1271,7 @@ class LunaRageFileManager : public Luna<RageFileManager>
}
//( Path, addTo, OnlyDirs=false, ReturnPathToo=false );
p->GetDirListing(SArg(1), vDirs, bOnlyDirs, bReturnPathToo);
StripMacResourceForks(vDirs);
LuaHelpers::CreateTableFromArray(vDirs, L);
return 1;
}
Expand Down

0 comments on commit 40d7f62

Please sign in to comment.