[qconnmanengine] Map connman "disconnect" status to QNetworkSession::…

…Disconnected
sailfishos · Jun 5, 2018 · bd170f0 · bd170f0
1 parent a78c08e
commit bd170f0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -241,14 +241,15 @@ QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
     if (!ptr || !ptr->isValid)
         return QNetworkSession::Invalid;
 
-    QString service = id;
-    QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
+    QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
     if (!serv)
         return QNetworkSession::Invalid;
 
     QString servState = serv->state();
 
-    if (serv->favorite() && (servState == QLatin1String("idle") || servState == QLatin1String("failure"))) {
+    if (servState == QLatin1String("idle") ||
+        servState == QLatin1String("failure") ||
+        servState == QLatin1String("disconnect")) {
         return QNetworkSession::Disconnected;
     }