jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Display the reason for the error in a server assign request

Browse source
This commit is contained in:
Micke Prag 2011-02-23 13:09:27 +00:00
parent c958ef46f1
commit 6f8a48ab8d
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
telldus-gui/Plugins/Live/LiveObject.cpp
View file

@ -225,7 +225,12 @@ void LiveObject::sslErrors( const QList<QSslError> & errors ) {
} }
void LiveObject::serverAssignReply( QNetworkReply *r ) { void LiveObject::serverAssignReply( QNetworkReply *r ) {
qDebug() << "Server assign reply"; r->deleteLater();
if (r->error() != QNetworkReply::NoError) {
emit errorChanged(r->errorString());
emit statusChanged("Error retrieving server list");
return;
}
QXmlStreamReader xml(r); QXmlStreamReader xml(r);
xml.readNextStartElement(); // enter <servers> xml.readNextStartElement(); // enter <servers>
@ -252,7 +257,6 @@ void LiveObject::serverAssignReply( QNetworkReply *r ) {
emit statusChanged("Retrying in " + QString::number(timeout) + " seconds..."); emit statusChanged("Retrying in " + QString::number(timeout) + " seconds...");
QTimer::singleShot(timeout * 1000, this, SLOT(connectToServer())); QTimer::singleShot(timeout * 1000, this, SLOT(connectToServer()));
} }
r->deleteLater();
} }
QByteArray LiveObject::signatureForMessage( const QByteArray &message ) { QByteArray LiveObject::signatureForMessage( const QByteArray &message ) {