summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2014-10-19 15:08:44 +0200
committerLubomir Rintel <lkundrak@v3.sk>2014-11-04 09:42:20 +0100
commit2107a4bbf136b38a5db3da57946dca472f4f8ecd (patch)
treea968d128c9e92e7e536e26b0805a403573152f50
parent7ee77d77bddd97310d772367ba9a70b1ef2b51e8 (diff)
downloadNetworkManager-2107a4bbf136b38a5db3da57946dca472f4f8ecd.tar.gz
connections: Don't give up if we've not seen an active connection yet
It will appear later on. https://bugzilla.redhat.com/show_bug.cgi?id=1149200
-rw-r--r--clients/cli/connections.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 1d51047ba2..8d57f663c1 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -1719,7 +1719,7 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data)
g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"),
nm_object_get_path (NM_OBJECT (active)));
quit ();
- } else if (ac_state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) {
+ } else if (active && ac_state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) {
g_string_printf (nmc->return_text, _("Error: Connection activation failed."));
nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
quit ();