From d22749012489485515028b67e86024e9ab706c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@googlemail.com>
Date: Sat, 23 Feb 2013 00:07:28 +0100
Subject: [PATCH] Fix starting bg-music when disabled on start.

---
 Vocaluxe/Base/CBackgroundMusic.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs
index 9284b73c..c758b1c9 100644
--- a/Vocaluxe/Base/CBackgroundMusic.cs
+++ b/Vocaluxe/Base/CBackgroundMusic.cs
@@ -392,16 +392,7 @@ namespace Vocaluxe.Base
 
         public static void CheckAndApplyConfig(EOffOn NewOnOff, EBackgroundMusicSource NewSource, float NewVolume)
         {
-            if (CConfig.BackgroundMusic != NewOnOff)
-            {
-                CConfig.BackgroundMusic = NewOnOff;
-                if (NewOnOff == EOffOn.TR_CONFIG_ON)
-                    Play();
-                else
-                    Pause();
-            }
-
-            if (CConfig.BackgroundMusicSource != NewSource)
+            if (CConfig.BackgroundMusicSource != NewSource || (NewOnOff == EOffOn.TR_CONFIG_ON && !_OwnMusicAdded && !_BackgroundMusicAdded))
             {
                 CConfig.BackgroundMusicSource = NewSource;
 
@@ -430,6 +421,15 @@ namespace Vocaluxe.Base
                 }
             }
 
+            if (CConfig.BackgroundMusic != NewOnOff)
+            {
+                CConfig.BackgroundMusic = NewOnOff;
+                if (NewOnOff == EOffOn.TR_CONFIG_ON)
+                    Play();
+                else
+                    Pause();
+            }
+
             if (CConfig.BackgroundMusicVolume != NewVolume)
             {
                 CConfig.BackgroundMusicVolume = (int)NewVolume;