From 1c28305b8343a5e3af6ada0a535f88e354c80bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= <pawelj@vulturis.eu>
Date: Wed, 23 Oct 2013 09:19:33 +0200
Subject: [PATCH] Content server tweaks

---
 kcc/KCC_gui.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index d5192aa..0843771 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -157,16 +157,23 @@ class WebServerThread(QtCore.QThread):
 
     def run(self):
         try:
-            self.server = HTTPServer(('', 4242), WebServerHandler)
-            self.running = True
             # Sweet cross-platform one-liner to get LAN ip address
             lIP = [ip for ip in socket.gethostbyname_ex(socket.gethostname())[2] if not ip.startswith("127.")][:1][0]
-            self.emit(QtCore.SIGNAL("addMessage"), '<b><a href="http://' + lIP +
-                                                   ':4242/">Content server</a></b> started.', 'info')
+        except:
+            # Sadly it can fail on some Linux configurations
+            lIP = None
+        try:
+            self.server = HTTPServer(('', 4242), WebServerHandler)
+            self.running = True
+            if lIP:
+                self.emit(QtCore.SIGNAL("addMessage"), '<b><a href="http://' + lIP +
+                                                       ':4242/">Content server</a></b> started.', 'info')
+            else:
+                self.emit(QtCore.SIGNAL("addMessage"), '<b>Content server</b> started on port 4242.', 'info')
             while self.running:
                 self.server.handle_request()
         except:
-            self.emit(QtCore.SIGNAL("addMessage"), '<b>Content server</b> crashed!', 'error')
+            self.emit(QtCore.SIGNAL("addMessage"), '<b>Content server</b> failed to start!', 'error')
 
     def stop(self):
         self.running = False