From 25cccfdeaff05fa80977b4e628e9a3ba5a870bf8 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sun, 22 Dec 2013 02:14:11 +0100 Subject: [PATCH] Bugfix: Crash when starting duet songs. Please TEST, TEST and TEST before commit! It can't be that this branch contains such silly bugs! --- Vocaluxe/Screens/CScreenNames.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 62a99c37..e227ceb5 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -598,7 +598,7 @@ namespace Vocaluxe.Screens _CheckMics(); _CheckPlayers(); - CSong firstSong = CGame.GetSong(0); + CSong firstSong = CGame.GetSong(1); for (int i = 0; i < CSettings.MaxNumPlayer; i++) { @@ -606,7 +606,7 @@ namespace Vocaluxe.Screens CProfiles.GetAvatarTextureFromProfile(CGame.Players[i].ProfileID) : _OriginalPlayerAvatarTextures[i]; _Texts[_TextPlayer[i]].Text = CProfiles.GetPlayerName(CGame.Players[i].ProfileID, i + 1); - if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet) + if (CGame.GetNumSongs() == 1 && firstSong.IsDuet) { _SelectSlides[_SelectSlideDuetPlayer[i]].Clear(); _SelectSlides[_SelectSlideDuetPlayer[i]].Visible = i + 1 <= CGame.NumPlayer;