a couple of fixes to stop the webui crashing when running within the gtkui

2 files changed, 11 insertions, 2 deletions

diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index f917c8826..6ec567b96 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -410,7 +410,10 @@ class WebApi(JSONComponent):
         self.host_list = ConfigManager("hostlist.conf.1.2", DEFAULT_HOSTS)
         self.core_config = CoreConfig()
         self.event_queue = EventQueue()
-        self.sessionproxy = SessionProxy()
+        try:
+            self.sessionproxy = component.get("SessionProxy")
+        except KeyError:
+            self.sessionproxy = SessionProxy()
 
     def get_host(self, host_id):
         """
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index f6a4d13f1..ba2c3d6b3 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -188,7 +188,13 @@ class Render(resource.Resource):
         return compress(template.render(), request)
 
 class Tracker(resource.Resource):
-    tracker_icons = TrackerIcons()
+
+    def __init__(self):
+        resource.Resource.__init__(self)
+        try:
+            self.tracker_icons = component.get("TrackerIcons")
+        except KeyError:
+            self.tracker_icons = TrackerIcons()
 
     def getChild(self, path, request):
         request.tracker_name = path