From 58590c0db33882f5beaa990ed573462c7d88aa5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Thu, 2 Apr 2015 11:12:13 +0200
Subject: [PATCH] Fixed duet-bug.

---
 Vocaluxe/Screens/CScreenSing.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index febdde72..f0a2aae8 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -562,9 +562,6 @@ namespace Vocaluxe.Screens
                     _Background = CDraw.AddTexture(Path.Combine(song.Folder, song.BackgroundFileNames[0]));
             }
 
-            _SingNotes[_SingBars].Init(CGame.NumPlayers);
-
-
             if (song.IsDuet)
             {
                 //TODO: Show more than 2 voicenames
@@ -579,11 +576,14 @@ namespace Vocaluxe.Screens
                 }
                 else
                 {
-                    for (int i = 0; i < CGame.NumPlayers; i++)
-                        CGame.Players[i].VoiceNr = voiceAssignments[i];
+					for (int i = 0; i < CGame.NumPlayers; i++) 
+						CGame.Players [i].VoiceNr = voiceAssignments [i];
                 }
             }
 
+			//Attention: This needs to be done after player-assignment!
+			_SingNotes[_SingBars].Init(CGame.NumPlayers);
+
             _DynamicLyricsTop = false;
             _DynamicLyricsBottom = false;