Merge pull request #448 from Vocaluxe/VideoPreviewFix-release0.4.1

Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391)
This commit is contained in:
daggeg authored and GitHub committed 2020-01-17 17:32:28 +01:00
commit de80eeb823
2 files changed
+8 -4

No files matched your search

+4 -2
View File
@@ -541,7 +541,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)
{
@@ -683,4 +685,4 @@ namespace VocaluxeLib.Menu.SongMenu
base.LoadSkin();
}
}
}
}
@@ -515,7 +515,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)
{
@@ -638,4 +640,4 @@ namespace VocaluxeLib.Menu.SongMenu
Init();
}
}
}
}