From 3fcb22269afc8bd8a5706fb400be76f5d57122d2 Mon Sep 17 00:00:00 2001
From: Stefan <info@stefan1200.de>
Date: Sat, 18 Jan 2020 23:28:57 +0100
Subject: [PATCH] Small changes to make sure song variable will be used after
 null checking

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

diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index c8e0d8ab..dab2ce04 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -1090,7 +1090,6 @@ namespace Vocaluxe.Screens
             }
 
             CSong song = CGame.GetSong();
-            song.ReloadSong(reloadNotes);
 
             if (song == null)
             {
@@ -1098,6 +1097,7 @@ namespace Vocaluxe.Screens
                 return;
             }
 
+            song.ReloadSong(reloadNotes);
             string songname = song.Artist + " - " + song.Title;
             int rounds = CGame.GetNumSongs();
             if (rounds > 1)