From 07b61dbe5a4d9bf05d1c88e10287f6c6f212ade0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 14 Apr 2013 13:14:20 +0200 Subject: [PATCH] Revert "Fix crash without profiles." This reverts commit 6b04bc79eb68212fd7ac5b6fe14af9c2d07351c8. Conflicts: Vocaluxe/Screens/CScreenNames.cs Vocaluxe/Screens/CScreenSing.cs --- Vocaluxe/Screens/CScreenNames.cs | 2 +- Vocaluxe/Screens/CScreenSing.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 22147721..32ec3c6c 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -580,7 +580,7 @@ namespace Vocaluxe.Screens //Update texture and name if (CConfig.Players[i].Length > 0) { - if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > 0) + if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > CGame.Player[i].ProfileID) { Statics[StaticPlayerAvatar[i]].Texture = CProfiles.Profiles[CGame.Player[i].ProfileID].Avatar.Texture; Texts[TextPlayer[i]].Text = CProfiles.Profiles[CGame.Player[i].ProfileID].PlayerName; diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 5ff746dd..da563a10 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -1342,7 +1342,7 @@ namespace Vocaluxe.Screens { for (int i = 0; i < CGame.NumPlayer; i++) { - if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > 0) + if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > CGame.Player[i].ProfileID) Statics[StaticAvatars[i, CGame.NumPlayer - 1]].Texture = CProfiles.Profiles[CGame.Player[i].ProfileID].Avatar.Texture; else Statics[StaticAvatars[i, CGame.NumPlayer - 1]].Visible = false; @@ -1353,7 +1353,7 @@ namespace Vocaluxe.Screens { for (int i = 0; i < CGame.NumPlayer; i++) { - if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > 0) + if (CGame.Player[i].ProfileID > -1 && CProfiles.NumProfiles > CGame.Player[i].ProfileID) Texts[TextNames[i, CGame.NumPlayer - 1]].Text = CProfiles.Profiles[CGame.Player[i].ProfileID].PlayerName; else Texts[TextNames[i, CGame.NumPlayer - 1]].Visible = false;