From 38e253821d62513128d8eb44c12d386ef7ca541f Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Tue, 6 Mar 2012 17:31:49 +0100 Subject: [PATCH] Do not show backgroundvideo if Next() is called --- Vocaluxe/Menu/CBackground.cs | 5 ++--- Vocaluxe/Screens/CPopupScreenPlayerControl.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Menu/CBackground.cs b/Vocaluxe/Menu/CBackground.cs index e1be78ce..5e5c3add 100644 --- a/Vocaluxe/Menu/CBackground.cs +++ b/Vocaluxe/Menu/CBackground.cs @@ -137,11 +137,10 @@ namespace Vocaluxe.Menu public bool Draw() { bool ok = false; - if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON) - ok = DrawVideo(); - if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CBackgroundMusic.VideoToBackgroundIsEnabled() && CBackgroundMusic.IsPlaying() && CBackgroundMusic.HasVideo()) ok = DrawBackgroundMusicVideo(); + else if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON) + ok = DrawVideo(); if (_Theme.TextureName != String.Empty && (_Theme.Type == EBackgroundTypes.Texture || diff --git a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs index 79188bbe..05a88add 100644 --- a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs +++ b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs @@ -155,7 +155,7 @@ namespace Vocaluxe.Screens if (CBackgroundMusic.IsVideoEnabled() && CBackgroundMusic.HasVideo()) { Statics[htStatics(StaticCover)].Texture = CBackgroundMusic.GetCover(); - Statics[htStatics(StaticCover)].Visible = true; + Statics[htStatics(StaticCover)].Visible = false; CDraw.DrawTexture(Statics[htStatics(StaticCover)], CBackgroundMusic.GetVideoTexture(), EAspect.Crop); } else