From 399bc71c75111f5349ed8fcaf4f1d6ba4790be31 Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Sun, 23 Dec 2012 12:54:59 +0100
Subject: [PATCH] some bugfixes for main screen

---
 PartyModeChallenge/PartyModeChallenge.cs       | 4 +++-
 PartyModeChallenge/PartyScreenChallengeMain.cs | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index b64fdba5..f700f35c 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -295,6 +295,8 @@ namespace Vocaluxe.PartyModes
                     if (_Screens != null)
                     {
                         _Base.Songs.ResetPartySongSung();
+                        ToScreenMain.ResultTable = new List<ResultTableRow>();
+                        GameData.ResultTable = new List<ResultTableRow>();
                         GameData.Rounds = new ChallengeRounds(GameData.NumRounds, GameData.NumPlayer, GameData.NumPlayerAtOnce);
                         GameData.CurrentRoundNr = 1;
                         ToScreenMain.CurrentRoundNr = 1;
@@ -484,10 +486,10 @@ namespace Vocaluxe.PartyModes
         {
             _ScreenSongOptions.Selection.RandomOnly = _ScreenSongOptions.Sorting.Tabs != EOffOn.TR_CONFIG_ON;
             _ScreenSongOptions.Selection.CategoryChangeAllowed = _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_ON;
-            GameData.CurrentRoundNr++;
             SetNumJokers();
             SetTeamNames();
             GameData.CatSongIndices = null;
+            GameData.CurrentRoundNr++;
             _Base.Graphics.FadeTo(EScreens.ScreenSong);
         }
 
diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs
index 911519c0..fb589fbd 100644
--- a/PartyModeChallenge/PartyScreenChallengeMain.cs
+++ b/PartyModeChallenge/PartyScreenChallengeMain.cs
@@ -226,6 +226,7 @@ namespace Vocaluxe.PartyModes
 
         private void NextRound()
         {
+            Data.ScreenMain.FadeToNameSelection = false;
             Data.ScreenMain.FadeToSongSelection = true;
             _PartyMode.DataFromScreen(_ThemeName, Data);
         }