From 8251eaf3b87e68ca7f77f2aba11b8e288ceb1824 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Sun, 10 Jun 2012 14:48:11 +0000
Subject: [PATCH] Dont attempt to access HTTPSocket if its not been created!
 BUG:22

---
 http/httpserver.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/http/httpserver.cpp b/http/httpserver.cpp
index 49134dcfa..ef6891e5d 100644
--- a/http/httpserver.cpp
+++ b/http/httpserver.cpp
@@ -25,6 +25,7 @@
 #include "httpsocket.h"
 #include "utils.h"
 #include "tags.h"
+#include "settings.h"
 #include <QtCore/QUrl>
 #include <QtCore/QThread>
 #ifdef ENABLE_KDE_SUPPORT
@@ -93,12 +94,12 @@ bool HttpServer::isAlive() const
 
 QString HttpServer::address() const
 {
-    return QLatin1String("http://127.0.0.1:")+QString::number(socket->port());
+    return QLatin1String("http://127.0.0.1:")+QString::number(socket ? socket->port() : Settings::self()->httpPort());
 }
 
 bool HttpServer::isOurs(const QString &url) const
 {
-    return url.startsWith(address()+"/");
+    return isAlive() ? url.startsWith(address()+"/") : false;
 }
 
 QByteArray HttpServer::encodeUrl(const Song &s) const