Merge pull request #75 from amccarthy/master

[connectionagent] Suppress errors when enabling tethering.
sailfishos · Jun 25, 2014 · 7ce614d · 7ce614d
2 parents ae5f9f4 + 31f3b4e
commit 7ce614d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -153,10 +153,14 @@ void QConnectionAgent::onUserInputCanceled()
 // from useragent
 void QConnectionAgent::onErrorReported(const QString &servicePath, const QString &error)
 {
-    if (error == "connect-failed"
-            && (servicePath.contains("cellular") && netman->offlineMode())) {
-     return;
-    }
+    // Suppress errors when switching to offline mode
+    if (error == "connect-failed" && servicePath.contains("cellular") && netman->offlineMode())
+        return;
+
+    // Suppress errors when switching to tethering mode
+    if ((delayedTethering || tetheringWifiTech->tethering()) && servicePath.contains(QStringLiteral("wifi")))
+        return;
+
     qDebug() << "<<<<<<<<<<<<<<<<<<<<" << servicePath << error;
     Q_EMIT errorReported(servicePath, error);
 }