In SongID::ToSong, check whether the dir is empty before prepending a slash, so GetSongFromDir can be skipped when the dir is empty.

2016-02-03 21:14:06 -07:00
parent 55e161336a
commit 026801e28d
1 changed files with 11 additions and 8 deletions
@@ -1131,15 +1131,18 @@ Song *SongID::ToSong() const
 {
 	Song *pRet = NULL;
 	if( !m_Cache.Get(&pRet) )
+	{
+		if(!sDir.empty())
 		{
 			// HACK for backwards compatibility: Re-add the leading "/".
 			// 2005/05/21 file layer changes added a leading slash.
 			RString sDir2 = sDir;
 			if(sDir2.Left(1) != "/")
+			{
 				sDir2 = "/" + sDir2;
-
-		if( !sDir2.empty() )
+			}
 			pRet = SONGMAN->GetSongFromDir(sDir2);
+		}
 		m_Cache.Set( pRet );
 	}
 	return pRet;