bearer-qmi: 'no-effect' errors while disconnecting aren't fatal

2012-08-30 11:26:28 +02:00
parent 2edbf674e0
commit 58553df9bb
1 changed files with 10 additions and 2 deletions
@@ -796,8 +796,16 @@ stop_network_ready (QmiClientWds *client,
    QmiMessageWdsStopNetworkOutput *output;

    output = qmi_client_wds_stop_network_finish (client, res, &error);
-    if (output)
-        qmi_message_wds_stop_network_output_get_result (output, &error);
+    if (output &&
+        !qmi_message_wds_stop_network_output_get_result (output, &error)) {
+        /* No effect error, we're already disconnected */
+        if (g_error_matches (error,
+                             QMI_PROTOCOL_ERROR,
+                             QMI_PROTOCOL_ERROR_NO_EFFECT)) {
+            g_error_free (error);
+            error = NULL;
+        }
+    }

    if (error) {
        if (ctx->running_ipv4)