From abe8987748015aaf0ee105c2c27508be50a1b055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 24 Aug 2014 20:22:38 +0200 Subject: [PATCH] Fixed sing-button in bg-popup. --- Vocaluxe/Base/CBackgroundMusic.cs | 13 ++++++++++++- VocaluxeLib/Utils/Player/CSongPlayer.cs | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs index 662a0c0d..dc922b6a 100644 --- a/Vocaluxe/Base/CBackgroundMusic.cs +++ b/Vocaluxe/Base/CBackgroundMusic.cs @@ -60,7 +60,18 @@ namespace Vocaluxe.Base } } - public static bool CanSing { get { return _BGMusicFiles.Contains(_CurrentPlaylistElement) ? false : _SongPlayer.CanSing; } } + public static bool CanSing + { + get + { + if (_PlaysPreview) + return false; + else + if (_BGMusicFiles.Contains(_CurrentPlaylistElement)) + return false; + else return true; + } + } public static bool Disabled { diff --git a/VocaluxeLib/Utils/Player/CSongPlayer.cs b/VocaluxeLib/Utils/Player/CSongPlayer.cs index a7fe62a0..078be067 100644 --- a/VocaluxeLib/Utils/Player/CSongPlayer.cs +++ b/VocaluxeLib/Utils/Player/CSongPlayer.cs @@ -35,7 +35,6 @@ namespace VocaluxeLib.Utils.Player } } } - public bool CanSing { get; private set; } public int SongID { get { return _Song == null ? -1 : _Song.ID; }