From 8b5bb563e61926ea16bfac4316fb3b597eba4a8b Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Thu, 12 Jul 2018 21:55:10 +0200
Subject: [PATCH] Horrible duet fix

---
 Vocaluxe/Screens/CScreenSing.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index e36dfbfd..b5eb65ed 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/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();