Merge pull request #393 from Jiiniasu/horrible_duet_fix

Horrible duet fix (fixes #370)

Vocaluxe/Screens/CScreenSing.cs

@@ -994,7 +994,20 @@ namespace Vocaluxe.Screens
             _CloseSong();
 
             CGame.NextRound();
-            CGame.ResetPlayer();
+            var voiceAssignments = new int[CGame.NumPlayers];
+            if (CGame.GetSong() != null && CGame.GetSong().IsDuet)
+            {
+                //Save duet-assignment before resetting
+                for (int i = 0; i < voiceAssignments.Length; i++)
+                    voiceAssignments[i] = CGame.Players[i].VoiceNr;
+                CGame.ResetPlayer();
+                for (int i = 0; i < voiceAssignments.Length; i++)
+                    CGame.Players[i].VoiceNr = voiceAssignments[i];
+            } else
+            {
+                CGame.ResetPlayer();
+            }            
+
 
             _LoadCurrentSong();