summaryrefslogtreecommitdiffstats
path: root/deluge/ui/client.py
diff options
context:
space:
mode:
authorbendikro <bro.devel+deluge@gmail.com>2016-04-13 21:38:33 +0200
committerCalum Lind <calumlind+deluge@gmail.com>2016-04-18 15:49:30 +0100
commit70d8b65f0a499d36f21c2c311ee02e3a9d67f03d (patch)
treede6c65ff7d0421e24f6427dbfbe81aa1ee234e5f /deluge/ui/client.py
parent5ebe14e452a61602ea43545d696a5ba288d38b42 (diff)
downloaddeluge-70d8b65f0a499d36f21c2c311ee02e3a9d67f03d.tar.gz
deluge-70d8b65f0a499d36f21c2c311ee02e3a9d67f03d.tar.bz2
deluge-70d8b65f0a499d36f21c2c311ee02e3a9d67f03d.zip
[WebUi] [Core] Fixes to plugin handling and WebUi plugin + tests
This should fix problems with errors occuring when failing to enable plugins. Errors in plugin handling are handled better and properly logged. WebUI plugin in particular had issues when being enabled and disabled multiple times because it was trying to create DelugeWeb component each time it was enabled. If deluge-web is already listening on the same port, enabling the WebUI plugin will fail, and the checkbox will not be checked. There are still some issues when enabling/disabling plugins by clicking fast multiple times on the checkbox.
Diffstat (limited to 'deluge/ui/client.py')
-rw-r--r--deluge/ui/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index 70ddda62a..6743f75cc 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -588,7 +588,7 @@ class Client(object):
if self.is_classicmode():
self._daemon_proxy.disconnect()
self.stop_classic_mode()
- return
+ return defer.succeed(True)
if self._daemon_proxy:
return self._daemon_proxy.disconnect()