Merge branch 'master' into rap

This commit is contained in:
Gary Kertopermono committed 2020-03-31 23:57:19 +02:00
commit 8d7116706d
8 files changed
+21 -20

No files matched your search

+4 -2
View File
@@ -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)
{
@@ -653,4 +655,4 @@ namespace VocaluxeLib.Menu.SongMenu
base.LoadSkin();
}
}
}
}