summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-11-04 14:28:01 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-11-04 14:29:18 +0100
commitf5585022787a57275687c7a1ec0ed3eaccaf5001 (patch)
treea4cd1c1442b450151d96804441bb40240feea72e
parentc8e2339091c4623d4aab790ddf8feedd95a7cd24 (diff)
downloadNetworkManager-f5585022787a57275687c7a1ec0ed3eaccaf5001.tar.gz
agent-manager: don't try to cancel requests that already finished
Fixes: 5d1cac81a0bcc66b891bc38f1a2cc4b84d47f08b
-rw-r--r--src/settings/nm-agent-manager.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index df6eb4af3b..2b71bd1a4e 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -841,8 +841,10 @@ _con_get_request_done (NMSecretAgent *agent,
req_complete_error (req, error);
g_error_free (error);
} else {
- /* Tell the failed agent we're no longer interested. */
- nm_secret_agent_cancel_secrets (req->current, req->current_call_id);
+ if (req->current_call_id) {
+ /* Tell the failed agent we're no longer interested. */
+ nm_secret_agent_cancel_secrets (req->current, req->current_call_id);
+ }
/* Try the next agent */
request_next_agent (req);