iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dont attempt to access HTTPSocket if its not been created!

Browse Source 
BUG:22
This commit is contained in:
craig.p.drummond
2012-06-10 14:48:11 +00:00
committed by craig.p.drummond
parent 3d4c516184
commit 8251eaf3b8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
http/httpserver.cpp
View File

@@ -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