diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml index 7c70d365..3eadd4f4 100644 --- a/Output/Themes/Ambient.xml +++ b/Output/Themes/Ambient.xml @@ -11,6 +11,6 @@ Cursor 40,000 40,000 - StaticColor + StaticColor \ No newline at end of file diff --git a/Vocaluxe/Base/ThemeSystem/CSkin.cs b/Vocaluxe/Base/ThemeSystem/CSkin.cs index ac4bea9e..f048821c 100644 --- a/Vocaluxe/Base/ThemeSystem/CSkin.cs +++ b/Vocaluxe/Base/ThemeSystem/CSkin.cs @@ -108,7 +108,7 @@ namespace Vocaluxe.Base.ThemeSystem } // load colors - if (_LoadColors(xmlReader)) + if (!_LoadColors(xmlReader)) return false; _IsLoaded = true; diff --git a/Vocaluxe/Base/ThemeSystem/CThemes.cs b/Vocaluxe/Base/ThemeSystem/CThemes.cs index 97661eee..d4814313 100644 --- a/Vocaluxe/Base/ThemeSystem/CThemes.cs +++ b/Vocaluxe/Base/ThemeSystem/CThemes.cs @@ -118,8 +118,6 @@ namespace Vocaluxe.Base.ThemeSystem public static bool ReadThemesFromFolder(string path, int partyModeID) { - Debug.Assert(_Themes.Count == 0); - List files = CHelper.ListFiles(path, "*.xml", false, true); List newThemes = new List(); @@ -175,7 +173,8 @@ namespace Vocaluxe.Base.ThemeSystem public static CTextureRef GetSkinTexture(string textureName, int partyModeID) { - Debug.Assert(!String.IsNullOrEmpty(textureName)); + if (String.IsNullOrEmpty(textureName)) + return null; CTheme theme = _GetTheme(partyModeID); CTextureRef texture = theme.CurrentSkin.GetTexture(textureName); if (texture == null && partyModeID >= 0)