add StripMacResourceForks(); hopefully prevents things like issue 178 ( http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=178 ) from happening again

This commit is contained in:
AJ Kelly
2010-08-26 00:49:40 -05:00
parent 705bf9b778
commit 20a1802758
8 changed files with 23 additions and 1 deletions
+3
View File
@@ -230,6 +230,7 @@ void SongManager::LoadStepManiaSongDir( RString sDir, LoadingWindow *ld )
GetDirListing( sDir+"*", arrayGroupDirs, true );
SortRStringArray( arrayGroupDirs );
StripCvsAndSvn( arrayGroupDirs );
StripMacResourceForks( arrayGroupDirs );
FOREACH_CONST( RString, arrayGroupDirs, s ) // foreach dir in /Songs/
{
@@ -241,6 +242,7 @@ void SongManager::LoadStepManiaSongDir( RString sDir, LoadingWindow *ld )
vector<RString> arraySongDirs;
GetDirListing( sDir+sGroupDirName + "/*", arraySongDirs, true, true );
StripCvsAndSvn( arraySongDirs );
StripMacResourceForks( arraySongDirs );
SortRStringArray( arraySongDirs );
LOG->Trace("Attempting to load %i songs from \"%s\"", int(arraySongDirs.size()),
@@ -731,6 +733,7 @@ void SongManager::InitCoursesFromDisk( LoadingWindow *ld )
// Find all group directories in Courses dir
GetDirListing( *sDir + "*", vsCourseGroupNames, true, true );
StripCvsAndSvn( vsCourseGroupNames );
StripMacResourceForks( vsCourseGroupNames );
}
// Search for courses both in COURSES_DIR and in subdirectories