From 761d25d68209cfe1e6522765ea32b31cfaa59ee2 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 25 Jan 2020 08:22:32 +0100 Subject: [PATCH] Fixed song name / updates to changes in CScreenSong.cs Fixed song name if Highscore was opened from song screen, but multiple rounds was played before. Two further updates to the changes made to CScreenSong.cs. --- Vocaluxe/Screens/CScreenHighscore.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs index 5e39e45d..2b838de9 100644 --- a/Vocaluxe/Screens/CScreenHighscore.cs +++ b/Vocaluxe/Screens/CScreenHighscore.cs @@ -243,7 +243,7 @@ namespace Vocaluxe.Screens _FromScreenSong = true; _Round = (int)EGameMode.TR_GAMEMODE_NORMAL; _Scores = new List[4]; - int songID = CSongs.VisibleSongs[CScreenSong.getSelectedSongID()].ID; + int songID = CScreenSong.getSelectedSongID(); EHighscoreStyle style = CBase.Config.GetHighscoreStyle(); for (int gameModeNum = 0; gameModeNum < 4; gameModeNum++) @@ -272,7 +272,7 @@ namespace Vocaluxe.Screens CSong song; if (_FromScreenSong) - song = CSongs.GetSong(CSongs.VisibleSongs[CScreenSong.getSelectedSongID()].ID); + song = CSongs.GetSong(CScreenSong.getSelectedSongID()); else song = CGame.GetSong(_Round); @@ -280,7 +280,7 @@ namespace Vocaluxe.Screens return; _Texts[_TextSongName].Text = song.Artist + " - " + song.Title; - if (points != null && points.NumRounds > 1) + if (points != null && !_FromScreenSong && points.NumRounds > 1) _Texts[_TextSongName].Text += " (" + (_Round + 1) + "/" + points.NumRounds + ")"; switch ((_FromScreenSong ? (EGameMode)_Round : CGame.GetGameMode(_Round)))