From d5ae52a8f75d36292c3ece7f2e0739d788e74902 Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Fri, 8 Aug 2014 17:50:41 +0200
Subject: [PATCH] Fix crash at song end

---
 Vocaluxe/SongQueue/CSongQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/SongQueue/CSongQueue.cs b/Vocaluxe/SongQueue/CSongQueue.cs
index d0b6190c..969013c9 100644
--- a/Vocaluxe/SongQueue/CSongQueue.cs
+++ b/Vocaluxe/SongQueue/CSongQueue.cs
@@ -125,7 +125,7 @@ namespace Vocaluxe.SongQueue
                     _SongQueue[_CurrentRound].GameMode);
             }
             _CurrentRound++;
-            _CurrentSong = CGameModes.Get(GetCurrentGameMode()).GetSong(_SongQueue[_CurrentRound].SongID);
+            _CurrentSong = IsFinished() ? null : CGameModes.Get(GetCurrentGameMode()).GetSong(_SongQueue[_CurrentRound].SongID);
         }
 
         public bool IsFinished()