summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2017-01-29 12:17:43 +0100
committerLubomir Rintel <lkundrak@v3.sk>2017-01-29 12:56:31 +0100
commit7399cf3b1689e7efd9c6bab9f6306d370c76cf4d (patch)
tree8a2e5a8f8e4d55b8fa428a8bf5ed55dc43320366
parentcc1491401f109e5d3d795ffcdc828eeaf95f4f9c (diff)
downloadNetworkManager-7399cf3b1689e7efd9c6bab9f6306d370c76cf4d.tar.gz
cli: add missing NULL-check
Only the connection down operation is cancellable, the other actions are not. Fixes: 73b560c215806ab72b1473751ba729a3b5596d69
-rw-r--r--clients/cli/connections.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index b9b79ec8f7..b40d517b7e 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -2774,8 +2774,9 @@ connection_cb_info_finish (ConnectionCbInfo *info, gpointer connection)
if (info->timeout_id)
g_source_remove (info->timeout_id);
- g_cancellable_cancel (info->cancellable);
- g_object_unref (info->cancellable);
+
+ nm_clear_g_cancellable (&info->cancellable);
+
g_signal_handlers_disconnect_by_func (info->nmc->client, connection_removed_cb, info);
g_slice_free (ConnectionCbInfo, info);
quit ();