From 06056a06e54f9441f27702f9f06f0a8142a87621 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 6 Feb 2003 20:29:21 +0000 Subject: [PATCH] fixed stripping of thumbs.db, better error reporting --- stepmania/src/smpackage/SMPackageInstallDlg.cpp | 2 +- stepmania/src/smpackage/smpackage.cpp | 6 ++++++ stepmania/src/smpackage/smpackageDlg.cpp | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp index 71640baef6..a9435ca010 100644 --- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp +++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp @@ -184,7 +184,7 @@ void CSMPackageInstallDlg::OnOK() } catch (CException* e) { - AfxMessageBox( "Error extracting files", MB_ICONSTOP ); + e->ReportError(); e->Delete(); exit( 1 ); } diff --git a/stepmania/src/smpackage/smpackage.cpp b/stepmania/src/smpackage/smpackage.cpp index 617cec2757..9aa0ddd035 100644 --- a/stepmania/src/smpackage/smpackage.cpp +++ b/stepmania/src/smpackage/smpackage.cpp @@ -88,6 +88,12 @@ BOOL CSmpackageApp::InitInstance() // test to see if this is a smzip file if( sPathLower.Right(3) == "zip" ) { + if( !DoesFileExist(sPath) ) + { + AfxMessageBox( ssprintf("The file '%s' does not exist. Aborting installation.",sPath), MB_ICONERROR ); + exit(0); + } + // We found a zip package. Prompt the user to install it! CSMPackageInstallDlg dlg( sPath ); int nResponse = dlg.DoModal(); diff --git a/stepmania/src/smpackage/smpackageDlg.cpp b/stepmania/src/smpackage/smpackageDlg.cpp index 058efd715d..5ccfff738c 100644 --- a/stepmania/src/smpackage/smpackageDlg.cpp +++ b/stepmania/src/smpackage/smpackageDlg.cpp @@ -274,9 +274,9 @@ bool ExportPackage( CString sPackageName, const CStringArray& asDirectoriesToExp // don't export "thumbs.db" files or "CVS" folders CString sDir, sFName, sExt; splitrelpath( sFilePath, sDir, sFName, sExt ); - if( 0==stricmp(sFName,"thumbs.db") ) + if( sFName.CompareNoCase("thumbs.db")==0 ) continue; // skip - if( 0==stricmp(sFName,"CVS") ) + if( sFName.CompareNoCase("thumbs.db")==0 ) continue; // skip try