Merge pull request #78 from lpotter/master

[connectionagent] Do not send connectionRequest if there is a service
sailfishos · Jul 9, 2014 · ca1b23e · ca1b23e
2 parents 2147d2f + a38e153
commit ca1b23e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -170,7 +170,15 @@ void QConnectionAgent::onConnectionRequest()
 {
     sendConnectReply("Suppress", 15);
     qDebug() << flightModeSuppression;
-    if (!flightModeSuppression) {
+    bool okToRequest = true;
+    Q_FOREACH (const QString &path, servicesMap.keys()) {
+        qDebug() << "checking" <<servicesMap.value(path)->name() << servicesMap.value(path)->autoConnect();
+        if (servicesMap.value(path)->autoConnect()) {
+            okToRequest = false;
+            break;
+        }
+    }
+    if (!flightModeSuppression && okToRequest) {
         Q_EMIT connectionRequest();
     }
 }