From 1022ce0036a5e3b77bc274204720d1583b47916e Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 28 Sep 2021 20:05:34 +0200 Subject: [PATCH] Fix condition for making themes configurable KPluginMetaData::findPlugins only returns valid json metdata, the previous check was accidentally kept for the condition that the plugin provides a theme engine. BUG: 442978 FIXED-IN: master --- src/kcmkwin/kwindecoration/decorationmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kcmkwin/kwindecoration/decorationmodel.cpp b/src/kcmkwin/kwindecoration/decorationmodel.cpp index ec3351f71d..dd5e1594a6 100644 --- a/src/kcmkwin/kwindecoration/decorationmodel.cpp +++ b/src/kcmkwin/kwindecoration/decorationmodel.cpp @@ -124,8 +124,8 @@ void DecorationsModel::init() QScopedPointer themeFinder( KPluginFactory::instantiatePlugin(info).plugin); KDecoration2::DecorationThemeMetaData data; + const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap(); if (themeFinder) { - const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap(); const QString &kns = findKNewStuff(decoSettingsMap); if (!kns.isEmpty() && !m_knsProviders.contains(kns)) { m_knsProviders.append(kns); @@ -144,9 +144,9 @@ void DecorationsModel::init() // it's a theme engine, we don't want to show this entry continue; } - data.setHasConfiguration(isConfigureable(decoSettingsMap)); - data.setBorderSize(recommendedBorderSize(decoSettingsMap)); } + data.setHasConfiguration(isConfigureable(decoSettingsMap)); + data.setBorderSize(recommendedBorderSize(decoSettingsMap)); data.setVisibleName(info.name().isEmpty() ? info.pluginId() : info.name()); data.setPluginId(info.pluginId()); data.setThemeName(data.visibleName());