diff --git a/src/sakia/data/files/plugins.py b/src/sakia/data/files/plugins.py index 62ab7b6d327108c2cb002d59cb0d64c070f96798..edb53d65bcd29c6458b3af6f9cc059054bd6c6d6 100644 --- a/src/sakia/data/files/plugins.py +++ b/src/sakia/data/files/plugins.py @@ -51,12 +51,13 @@ class PluginsDirectory: try: plugin_module = importlib.import_module(module_name) self.with_plugin = Plugin(plugin_module.PLUGIN_NAME, - plugin_module.PLUGIN_DESCRIPTION, - plugin_module.PLUGIN_VERSION, - True, - plugin_module, - with_plugin) + plugin_module.PLUGIN_DESCRIPTION, + plugin_module.PLUGIN_VERSION, + True, + plugin_module, + with_plugin) except ImportError as e: + self.with_plugin = Plugin(module_name, "", "", False, None, with_plugin) self._logger.debug(str(e) + " with sys.path " + str(sys.path)) except OSError as e: self._logger.debug(str(e)) diff --git a/src/sakia/gui/main_window/model.py b/src/sakia/gui/main_window/model.py index b2e8664132a621eb7e52f6af1374551ef5ad169e..01b0938ba1de55744420cde150cd7139e961db70 100644 --- a/src/sakia/gui/main_window/model.py +++ b/src/sakia/gui/main_window/model.py @@ -11,6 +11,8 @@ class MainWindowModel(QObject): self.app = app def load_plugins(self, main_window): - for plugin in self.app.plugins_dir.plugins + [self.app.plugins_dir.with_plugin]: + for plugin in self.app.plugins_dir.plugins: if plugin.imported: plugin.module.plugin_exec(self.app, main_window) + if self.app.plugins_dir.with_plugin: + self.app.plugins_dir.with_plugin.module.plugin_exec(self.app, main_window)