Commit bbe3c594 authored by Fabian Vogt's avatar Fabian Vogt
Browse files

Fix ExternalAppModules not showing up

When the concept of "modules as categories" was implemented, it broke
inclusion of ExternalAppModules in two places.

(cherry picked from commit 98cf5ba4)
parent 2a243a0e
......@@ -282,7 +282,7 @@ void SettingsBase::initMenuList(MenuItem *parent)
? parent->service()->property(QStringLiteral("X-KDE-System-Settings-Category-Module")).toString()
: QString();
if (parentCategoryKcm == entry->library()) {
if (!parentCategoryKcm.isEmpty() && parentCategoryKcm == entry->library()) {
parent->setItem(KCModuleInfo(entry));
removeList.append(modules.at(i));
} else if (!parent->category().isEmpty() && (category == parent->category() || category2 == parent->category())) {
......
......@@ -231,7 +231,7 @@ void ModuleView::loadModule(const QModelIndex &menuItem, const QStringList &args
MenuItem *item = menuItem.data(Qt::UserRole).value<MenuItem *>();
if (!item->item().library().isEmpty()) {
if (!item->item().library().isEmpty() || !item->service()->exec().isEmpty()) {
indexes << menuItem;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment