Merge pull request #392 from Vocaluxe/PreviewDisableFix

Fix: Config.Video.VideoPreview is ignored (fixes #391)

VocaluxeLib/Menu/SongMenu/CSongMenuList.cs

@@ -511,7 +511,9 @@ namespace VocaluxeLib.Menu.SongMenu
             }
             _TextBG.Draw();
 
-            CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
+            CTextureRef vidtex = null;
+            if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
+                vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
 
             if (vidtex != null)
             {

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -485,7 +485,9 @@ namespace VocaluxeLib.Menu.SongMenu
 
             _TextBG.Draw();
 
-            CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
+            CTextureRef vidtex = null;
+            if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
+                vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
 
             if (vidtex != null)
             {
@@ -608,4 +610,4 @@ namespace VocaluxeLib.Menu.SongMenu
             Init();
         }
     }
-}
+}

VocaluxeLib/Utils/Player/CSongPlayer.cs

@@ -110,6 +110,7 @@ namespace VocaluxeLib.Utils.Player
 
             if (_Video != null || !SongHasVideo)
                 return;
+
             string videoFilePath = Path.Combine(_Song.Folder, _Song.VideoFileName);
             _Video = CBase.Video.Load(videoFilePath);
             if (_Video == null)
@@ -175,4 +176,4 @@ namespace VocaluxeLib.Utils.Player
             _CloseVideo();
         }
     }
-}
+}