From 084329f9f1b02a7f00d34dbc4b292462ae339131 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 28 Sep 2015 11:56:32 +0100 Subject: [PATCH] [#2729] [Blocklist] Fix plugin lockup with empty url --- deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py | 2 ++ deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py index e13fa0d79..def22af36 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py @@ -123,6 +123,8 @@ class Core(CorePluginBase): Deferred: A Deferred which fires when the blocklist has been imported. """ + if not self.config["url"]: + return # Reset variables self.filename = None diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py index 5e3e60d21..016dd5150 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py @@ -121,7 +121,7 @@ class GtkUI(GtkPluginBase): def _on_apply_prefs(self): config = {} - config["url"] = self.glade.get_widget("entry_url").get_text() + config["url"] = self.glade.get_widget("entry_url").get_text().strip() config["check_after_days"] = self.glade.get_widget("spin_check_days").get_value_as_int() config["load_on_start"] = self.glade.get_widget("chk_import_on_start").get_active() config["whitelisted"] = [ip[0] for ip in self.whitelist_model if ip[0] != 'IP HERE']