From b517c556932b0d513569de3794cfa1541c7e6e39 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 27 Feb 2003 08:38:24 +0000
Subject: [PATCH] smpackage: fix courses and RandomMovies being added to zip
 file twice

---
 stepmania/src/PrefsManager.cpp                 |  4 ++--
 stepmania/src/smpackage/SmpackageExportDlg.cpp | 11 +++++++++--
 stepmania/src/smpackage/smpackage.clw          |  4 ++--
 stepmania/stepmania.nsi                        |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

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<asDirectoriesToExport.GetSize(); i++ )
 	{
 		CStringArray asFilePaths;
-		asFilePaths.Add( asDirectoriesToExport[i] );
 		GetFilePaths( asDirectoriesToExport[i], asFilePaths );
  
 		for( int j=0; j<asFilePaths.GetSize(); j++ )
diff --git a/stepmania/src/smpackage/smpackage.clw b/stepmania/src/smpackage/smpackage.clw
index f57df99f89..56d7882a3d 100644
--- a/stepmania/src/smpackage/smpackage.clw
+++ b/stepmania/src/smpackage/smpackage.clw
@@ -13,10 +13,10 @@ Class2=CSmpackageDlg
 
 ResourceCount=5
 Resource1=IDR_MAINFRAME
-Resource2=IDD_DIALOG_NAME
+Resource2=IDD_INSTALL
 Class3=CSMPackageInstallDlg
 Class4=CSmpackageExportDlg
-Resource3=IDD_INSTALL
+Resource3=IDD_DIALOG_NAME
 Class5=EnterName
 Resource4=IDD_EXPORTER
 Class6=EditInsallations
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index d63a47ae0e..02ad0bb7ae 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -19,7 +19,7 @@
 !define PRODUCT_NAME_VER "${PRODUCT_NAME} ${VERSION}"
 
 Name "${PRODUCT_NAME}"
-OutFile "StepMania-CVS-20030224.exe"
+OutFile "StepMania-CVS-20030226.exe"
 ;OutFile "StepMania301.exe"
 
 ; Some default compiler settings (uncomment and change at will):