diff --git a/deluge/pluginmanagerbase.py b/deluge/pluginmanagerbase.py index 774001a2c..4f5108838 100644 --- a/deluge/pluginmanagerbase.py +++ b/deluge/pluginmanagerbase.py @@ -87,7 +87,7 @@ class PluginManagerBase: pkg_resources.working_set.add_entry(plugin_dir) pkg_resources.working_set.add_entry(user_plugin_dir) self.pkg_env = pkg_resources.Environment([plugin_dir, user_plugin_dir]) - + self.available_plugins = [] for name in self.pkg_env: pkg_name = str(self.pkg_env[name][0]).split()[0].replace("-", " ") diff --git a/deluge/ui/gtkui/pluginmanager.py b/deluge/ui/gtkui/pluginmanager.py index 8a545faaf..b3e2416a9 100644 --- a/deluge/ui/gtkui/pluginmanager.py +++ b/deluge/ui/gtkui/pluginmanager.py @@ -49,8 +49,7 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase, """Start the plugin manager""" # Update the enabled_plugins from the core enabled_plugins = client.get_enabled_plugins() - enabled_plugins += self.config["enabled_plugins"] - enabled_plugins = list(set(enabled_plugins)) + log.debug("Core has these plugins enabled: %s", enabled_plugins) self.config["enabled_plugins"] = enabled_plugins # Enable the plugins that are enabled in the config and core