From 1a31e7441fe9e53476897b22e43f2bd5eb05e560 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 21 May 2019 14:36:17 -0400 Subject: [PATCH] remove mac junk in getdirlisting again and add exception for ._pulse cuz lul --- src/RageUtil/File/RageFileManager.cpp | 1 + src/RageUtil/Utils/RageUtil.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/RageUtil/File/RageFileManager.cpp b/src/RageUtil/File/RageFileManager.cpp index ee89f342bb..e6bf5ddc0f 100644 --- a/src/RageUtil/File/RageFileManager.cpp +++ b/src/RageUtil/File/RageFileManager.cpp @@ -459,6 +459,7 @@ RageFileManager::GetDirListing(const RString& sPath_, } UnreferenceAllDrivers(apDriverList); + StripMacResourceForks(AddTo); if (iDriversThatReturnedFiles > 1) { /* More than one driver returned files. Remove duplicates diff --git a/src/RageUtil/Utils/RageUtil.cpp b/src/RageUtil/Utils/RageUtil.cpp index db64cb286d..73710099f6 100644 --- a/src/RageUtil/Utils/RageUtil.cpp +++ b/src/RageUtil/Utils/RageUtil.cpp @@ -1369,7 +1369,7 @@ StripCvsAndSvn(vector& vs) static bool MacResourceFork(const RString& s) { - return s.Left(2).EqualsNoCase("._"); + return s.Left(2).EqualsNoCase("._") && s != "._Pulse.sm"; } void