actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix "../" in #MUSIC tag asserting

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-06 04:06:37 +00:00
parent 4502507915
commit 9a41c54bf5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+9 -8
View File
@@ -468,6 +468,15 @@ void FixupPath( CString &path, const CString &sSongPath )
/* Songs in BlacklistImages will never be autodetected as song images. */ /* Songs in BlacklistImages will never be autodetected as song images. */
void Song::TidyUpData() void Song::TidyUpData()
{ {
/* We need to do this before calling any of HasMusic, HasHasCDTitle, etc. */
ASSERT_M( m_sSongDir.Left(3) != "../", m_sSongDir ); /* meaningless */
FixupPath( m_sSongDir, "" );
FixupPath( m_sMusicFile, m_sSongDir );
FixupPath( m_sBannerFile, m_sSongDir );
FixupPath( m_sLyricsFile, m_sSongDir );
FixupPath( m_sBackgroundFile, m_sSongDir );
FixupPath( m_sCDTitleFile, m_sSongDir );
if( !HasMusic() ) if( !HasMusic() )
{ {
CStringArray arrayPossibleMusic; CStringArray arrayPossibleMusic;
@@ -593,14 +602,6 @@ void Song::TidyUpData()
CHECKPOINT_M( "Looking for images..." ); CHECKPOINT_M( "Looking for images..." );
ASSERT_M( m_sSongDir.Left(3) != "../", m_sSongDir ); /* meaningless */
FixupPath( m_sSongDir, "" );
FixupPath( m_sMusicFile, m_sSongDir );
FixupPath( m_sBannerFile, m_sSongDir );
FixupPath( m_sLyricsFile, m_sSongDir );
FixupPath( m_sBackgroundFile, m_sSongDir );
FixupPath( m_sCDTitleFile, m_sSongDir );
// //
// First, check the file name for hints. // First, check the file name for hints.
// //