on the path to bork

jameskr97 · Dec 6, 2018 · 6fe555e · 6fe555e
1 parent 2033098
commit 6fe555e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
@@ -166,25 +166,6 @@ ScreenSelectMusic::Init()
 	m_sLoopMusicPath = THEME->GetPathS(m_sName, "loop music");
 	m_sFallbackCDTitlePath = THEME->GetPathG(m_sName, "fallback cdtitle");
 
-	// surely we can devise a better way to handle loading cached images
-	/*
-	// load banners
-	if (PREFSMAN->m_ImageCache != IMGCACHE_OFF) {
-		m_TexturePreload.Load(
-		  Banner::SongBannerTexture(THEME->GetPathG("Banner", "all music")));
-		m_TexturePreload.Load(Banner::SongBannerTexture(
-		  THEME->GetPathG("Common", "fallback banner")));
-		m_TexturePreload.Load(
-		  Banner::SongBannerTexture(THEME->GetPathG("Banner", "roulette")));
-		m_TexturePreload.Load(
-		  Banner::SongBannerTexture(THEME->GetPathG("Banner", "random")));
-		m_TexturePreload.Load(
-		  Banner::SongBannerTexture(THEME->GetPathG("Banner", "mode")));
-	}
-
-	// Load low-res banners and backgrounds if needed.
-	IMAGECACHE->Demand("Banner");
-	*/
 
 	// build the playlist groups here, songmanager's init from disk can't
 	// because profiles aren't loaded until after that's done -mina

diff --git a/src/Song.cpp b/src/Song.cpp
@@ -581,6 +581,8 @@ Song::TidyUpData(bool from_cache, bool /* duringCache */)
 
 	m_sMusicPath = GetSongAssetPath(m_sMusicFile, m_sSongDir);
 	m_PreviewPath = GetSongAssetPath(m_PreviewFile, m_sSongDir);
+	if (m_PreviewPath.empty())
+		m_PreviewPath = m_sMusicPath;
 	FOREACH_ENUM(InstrumentTrack, it)
 	m_sInstrumentTrackPath[it] =
 	  GetSongAssetPath(m_sInstrumentTrackFile[it], m_sSongDir);