Merge branch 'Applications/16.08'

* Applications/16.08:
  Don't load twice kfileitemaction plugins with json metadata
  Fix logic for loading kfileitemaction plugins

1 files changed, 1 insertions, 4 deletions

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9507ba0a8..971ef1e35 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -498,10 +498,6 @@ void DolphinContextMenu::addFileItemPluginActions()
     }
 
     const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, QStringLiteral("KFileItemAction/Plugin"), QStringLiteral("exist Library"));
-    if (pluginServices.isEmpty()) {
-        return;
-    }
-
     const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
     const KConfigGroup showGroup = config.group("Show");
 
@@ -551,6 +547,7 @@ void DolphinContextMenu::addFileItemPluginActions()
         if (abstractPlugin) {
             abstractPlugin->setParent(this);
             addActions(abstractPlugin->actions(props, m_mainWindow));
+            addedPlugins << jsonMetadata.pluginId();
         }
     }
 }