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

Resolve more song assets relative to song

Browse Source 
Check to see if file exists in relative path before assuming it's
absolute.
This commit is contained in:
Devin J. Pohly
2013-10-12 23:50:44 -04:00
parent afe3009c7d
commit 4c7fcc4e0c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+6 -2
View File
@@ -1370,16 +1370,20 @@ RString GetSongAssetPath( RString sPath, const RString &sSongPath )
if( sPath == "" ) if( sPath == "" )
return RString(); return RString();
RString sRelPath = sSongPath + sPath;
if( DoesFileExist(sRelPath) )
return sRelPath;
/* If there's no path in the file, the file is in the same directory as the /* If there's no path in the file, the file is in the same directory as the
* song. (This is the preferred configuration.) */ * song. (This is the preferred configuration.) */
if( sPath.find('/') == string::npos ) if( sPath.find('/') == string::npos )
return sSongPath+sPath; return sRelPath;
// The song contains a path; treat it as relative to the top SM directory. // The song contains a path; treat it as relative to the top SM directory.
if( sPath.Left(3) == "../" ) if( sPath.Left(3) == "../" )
{ {
// The path begins with "../". Resolve it wrt. the song directory. // The path begins with "../". Resolve it wrt. the song directory.
sPath = sSongPath + sPath; sPath = sRelPath;
} }
CollapsePath( sPath ); CollapsePath( sPath );