From 1af7ed12204b45c9ccc53afbcc8217d3aa7154ce Mon Sep 17 00:00:00 2001 From: Mika Allan Rauhala Date: Fri, 10 Apr 2015 10:45:10 +0200 Subject: [PATCH] Fix DecorationPalette loading when kdeglobals lacks WM group Currently, if a color scheme lacks the WM group, DecorationPalette doesn't load it so we can fallback to kdeglobals color scheme. If kdeglobals doesn't have WM group we get black decorations. This change will always load the kdeglobals color scheme even if it is missing WM group. REVIEW: 123320 --- decorations/decorationpalette.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decorations/decorationpalette.cpp b/decorations/decorationpalette.cpp index de7e560c50..d086de9817 100644 --- a/decorations/decorationpalette.cpp +++ b/decorations/decorationpalette.cpp @@ -106,7 +106,7 @@ void DecorationPalette::update() auto config = KSharedConfig::openConfig(m_colorScheme, KConfig::SimpleConfig); KConfigGroup wmConfig(config, QStringLiteral("WM")); - if (!wmConfig.exists()) { + if (!wmConfig.exists() && !m_colorScheme.endsWith(QStringLiteral("/kdeglobals"))) { qWarning() << "Invalid color scheme" << m_colorScheme << "lacks WM group"; return; }