don't try to add unloaded charts to a playlist group, it'll crash

etternagame · Jun 7, 2017 · bdfd39d · bdfd39d
1 parent dd59276
commit bdfd39d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -347,7 +347,8 @@ void Playlist::LoadFromNode(const XNode* node) {
 
 	vector<Song*> playlistgroup;
 	for (auto& n : chartlist)
-		playlistgroup.emplace_back(SONGMAN->GetSongByChartkey(n.key));
+		if(n.loaded)
+			playlistgroup.emplace_back(SONGMAN->GetSongByChartkey(n.key));
 
 	SONGMAN->groupderps[name] = playlistgroup;
 }
@@ -391,7 +392,8 @@ void SongManager::MakePlaylistFromFavorites(set<string>& favs) {
 
 	vector<Song*> playlistgroup;
 	for (auto& n : pl.chartlist)
-		playlistgroup.emplace_back(SONGMAN->GetSongByChartkey(n.key));
+		if(n.loaded)
+			playlistgroup.emplace_back(SONGMAN->GetSongByChartkey(n.key));
 
 	SONGMAN->groupderps["Favorites"] = playlistgroup;
 	SongUtil::SortSongPointerArrayByTitle(groupderps["Favorites"]);