From 5d22a96d1dc86d9c3262f0cf33bc7ee02bd0db54 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sun, 29 Jan 2017 12:17:43 +0100
Subject: [PATCH] cli: add missing NULL-check

Only the connection down operation is cancellable, the other actions are not.

Fixes: 73b560c215806ab72b1473751ba729a3b5596d69
(cherry picked from commit 7399cf3b1689e7efd9c6bab9f6306d370c76cf4d)
---
 clients/cli/connections.c | 5 +++--
 1 file 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 ();