gui fix, plugin with no main function fix

3 files changed, 7 insertions, 2 deletions

diff --git a/module/PluginThread.py b/module/PluginThread.py
index e6e0c50c7..81cf24e8c 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -140,6 +140,11 @@ class DownloadThread(PluginThread):
             except NotImplementedError:
 
                 self.m.log.error(_("Plugin %s is missing a function.") % pyfile.pluginname)
+                pyfile.setStatus("failed")
+                pyfile.error = "Plugin does not work"
+                pyfile.plugin.req.clean()
+                self.active = False
+                pyfile.release()
                 continue
 
             except Abort:
diff --git a/pyLoadCore.py b/pyLoadCore.py
index c1c1f8fbb..30468bac2 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -416,7 +416,7 @@ class Core(object):
     def shutdown(self):
         self.log.info(_("shutting down..."))
         try:
-            if self.config['webinterface']['activated']:
+            if self.config['webinterface']['activated'] and hasattr(self, "webserver"):
                 self.webserver.quit()
             #self.webserver.join()
             for thread in self.threadManager.threads:
diff --git a/pyLoadGui.py b/pyLoadGui.py
index c3703a1c5..afe47a3a4 100755
--- a/pyLoadGui.py
+++ b/pyLoadGui.py
@@ -436,10 +436,10 @@ class main(QObject):
             if not self.core:
 
                 config = CoreConfig() #create so at least default config exists
-
                 self.core = Core()
                 thread.start_new_thread(self.core.start, (False,False))
                 self.connector.setAddr(("core", self.core))
+                self.mainWindow.mactions["manager"].setDisabled(True) #workaround to supress bug
 
 
         self.startMain()