Changeset 1702 in ntrip

Timestamp:

Mar 4, 2009, 1:03:04 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncnetqueryv2.cpp (modified) (3 diffs)

trunk/BNC/bncnetqueryv2.cpp

@@ -48 +48 @@
 void bncNetQueryV2::stop() {
   if (_reply) {
-    _reply->disconnect(SIGNAL(error(QNetworkReply::NetworkError)));
     _reply->abort();
   }
@@ -58 +57 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::slotError(QNetworkReply::NetworkError) {
+  _eventLoop->quit();
   _status = error;
-  emit newMessage(_url.path().toAscii().replace(0,1,"") 
-                  + ": NetQuery, " + _reply->errorString().toAscii(), true);
-  _eventLoop->quit();
+
+  emit newMessage(_url.path().toAscii().replace(0,1,"")  +
+                  ": NetQuery, Error - server replied: " + 
+                  _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
+                  true);
 }
 
@@ -174 +176 @@
   // ------------------------
   if (_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
-    _reply->disconnect(SIGNAL(error(QNetworkReply::NetworkError)));
     _reply->abort();
-    _eventLoop->quit();
-    _status = error;
-    emit newMessage(_url.path().toAscii().replace(0,1,"") +
-                    ": NetQuery, Error - server replied: " + 
-                    _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
-                    true);
+    slotError(QNetworkReply::UnknownNetworkError);
   }