Fix images not being seen on first load.

Work around broken data with leading spaces in the path.
This commit is contained in:
Glenn Maynard
2003-04-20 23:45:01 +00:00
parent f33f42e8c6
commit ca0e88c0a8
2 changed files with 19 additions and 5 deletions
-5
View File
@@ -275,11 +275,6 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
LOG->Trace( "Unexpected value named '%s'", sValueName.GetString() );
}
out.m_sBannerFile.Replace("\\", "/");
out.m_sBackgroundFile.Replace("\\", "/");
out.m_sCDTitleFile.Replace("\\", "/");
out.m_sMusicFile.Replace("\\", "/");
return true;
}
+19
View File
@@ -512,6 +512,25 @@ void Song::TidyUpData()
LOG->Trace("Looking for images...");
/* Replace backslashes with slashes in all paths. */
m_sMusicFile.Replace("\\", "/");
m_sBannerFile.Replace("\\", "/");
m_sBackgroundFile.Replace("\\", "/");
m_sCDTitleFile.Replace("\\", "/");
m_sLyricsFile.Replace("\\", "/");
/* Many imported files contain erroneous whitespace before or after
* filenames. Paths usually don't actually start or end with spaces,
* so let's just remove it. */
TrimLeft(m_sBannerFile);
TrimRight(m_sBannerFile);
TrimLeft(m_sBackgroundFile);
TrimRight(m_sBackgroundFile);
TrimLeft(m_sCDTitleFile);
TrimRight(m_sCDTitleFile);
TrimLeft(m_sLyricsFile);
TrimRight(m_sLyricsFile);
//
// First, check the file name for hints.
//