diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 134b1c7af1..726007d44b 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -93,8 +93,8 @@ PrefsManager::PrefsManager() * stage CRS files) don't get it changed around on them. */ m_bPickExtraStage = false; - m_fLongVerSongSeconds = 60*3; - m_fMarathonVerSongSeconds = 60*5; + m_fLongVerSongSeconds = 60*2.5f; // Dynamite Rave is 2:55 + m_fMarathonVerSongSeconds = 60*5.f; /* I'd rather get occasional people asking for support for this even though it's * already here than lots of people asking why songs aren't being displayed. */ diff --git a/stepmania/src/smpackage/SmpackageExportDlg.cpp b/stepmania/src/smpackage/SmpackageExportDlg.cpp index 4c49717ca3..5ad23089cf 100644 --- a/stepmania/src/smpackage/SmpackageExportDlg.cpp +++ b/stepmania/src/smpackage/SmpackageExportDlg.cpp @@ -91,9 +91,17 @@ void GetFilePaths( CString sDirOrFile, CStringArray& asPathToFilesOut ) // Not sure if this is ZipArchive's fault. if( IsADirectory(sDirOrFile) && sDirOrFile.Right(1) != "\\" ) + { sDirOrFile += "\\"; + sDirOrFile += "*.*"; + } - sDirOrFile += "*.*"; + if( IsAFile(sDirOrFile) ) + { + asPathToFilesOut.Add( sDirOrFile ); + return; + } + GetDirListing( sDirOrFile, asPathToFilesOut, false, true ); GetDirListing( sDirOrFile, asDirectoriesToExplore, true, true ); @@ -157,7 +165,6 @@ bool ExportPackage( CString sPackageName, const CStringArray& asDirectoriesToExp for( int i=0; i