From 6371eeb2a98d3c92e3d8f6dde9cea801d6639fd4 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kueper@googlemail.com>
Date: Sat, 22 Dec 2012 21:28:15 +0100
Subject: [PATCH] Show avarage rating of sung songs at first.

---
 Vocaluxe/Screens/CScreenScore.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index 7f757743..dc258bd1 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -109,7 +109,10 @@ namespace Vocaluxe.Screens
         public override void OnShow()
         {
             base.OnShow();
-            _Round = 1;
+            if (CGame.NumRounds > 1)
+                _Round = 0;
+            else
+                _Round = 1;
             _Points = CGame.GetPoints();
 
             SetVisuability();
@@ -370,21 +373,16 @@ namespace Vocaluxe.Screens
 
         private void ChangeRound(int Num)
         {
-            if ((_Round + Num) <= _Points.NumRounds && (_Round + Num) > 0 && _Round != 0)
+            if((_Round + Num) <= _Points.NumRounds && (_Round + Num > 0))
             {
                 _Round += Num;
                 UpdateRatings();
             }
-            else if(Num > 0 && _Round != 0 && CGame.NumRounds > 1)
+            else if(Num < 0 && _Round == 1 && CGame.NumRounds > 1)
             {
                 _Round = 0;
                 UpdateRatings();
             }
-            else if (Num < 0 && _Round == 0)
-            {
-                _Round = CGame.NumRounds;
-                UpdateRatings();
-            }
         }
 
         private void LeaveScreen()