From dbb4b23db0f36bc56c8283ed746f100450f8a7a0 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <stephansundermann@gmail.com>
Date: Tue, 1 May 2012 23:11:27 +0200
Subject: [PATCH] Background music was playing after screen fading when stopped
 Background music can now be stopped in loadscreen

---
 Vocaluxe/Menu/CGraphics.cs      | 3 ++-
 Vocaluxe/Screens/CScreenLoad.cs | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs
index 27ab24c5..3472f122 100644
--- a/Vocaluxe/Menu/CGraphics.cs
+++ b/Vocaluxe/Menu/CGraphics.cs
@@ -385,7 +385,8 @@ namespace Vocaluxe.Menu
                     _Screens[(int)_CurrentScreen].OnClose();
                     _CurrentScreen = _NextScreen;
                     _NextScreen = EScreens.ScreenNull;
-                    CBackgroundMusic.Play();
+                    if(CBackgroundMusic.Playing)
+                        CBackgroundMusic.Play();
                     _Screens[(int)_CurrentScreen].OnShowFinish();
                     _Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y);
                     _Screens[(int)_CurrentScreen].Draw();
diff --git a/Vocaluxe/Screens/CScreenLoad.cs b/Vocaluxe/Screens/CScreenLoad.cs
index 4c803c5b..3a1a3c96 100644
--- a/Vocaluxe/Screens/CScreenLoad.cs
+++ b/Vocaluxe/Screens/CScreenLoad.cs
@@ -120,6 +120,9 @@ namespace Vocaluxe.Screens
                     _Intros[i].Load(IntroVideo[i]);
                 }
             }
+
+            if (!CBackgroundMusic.Playing)
+                CBackgroundMusic.Next();
         }
 
         public override void OnShowFinish()
@@ -173,8 +176,8 @@ namespace Vocaluxe.Screens
             {
                 CBackgroundMusic.AddOwnMusic();
 
-                if (!CBackgroundMusic.Playing)
-                    CBackgroundMusic.Next();
+                //if (!CBackgroundMusic.Playing)
+                //    CBackgroundMusic.Next();
             }
 
             return true;