Merge pull request #74 from lpotter/master

[connectionagent] disconnect mobile data if wifi becomes ready
sailfishos · Jun 24, 2014 · bcaabd3 · bcaabd3
2 parents 77ec166 + 21182e3
commit bcaabd3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -249,6 +249,11 @@ void QConnectionAgent::serviceStateChanged(const QString &state)
     if (delayedTethering && service->type() == "wifi" && state == "association") {
         service->requestDisconnect();
     }
+    if (state == "ready" && service->type() == "wifi"
+            && !delayedTethering
+            && netman->defaultRoute()->type() == "cellular") {
+        netman->defaultRoute()->requestDisconnect();
+    }
     if (state == "online") {
         Q_EMIT connectionState(state, service->type());