From 2c4e991abae3bd92064d62d5ffe951d2564d68c9 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Tue, 11 Apr 2017 15:39:08 +0200 Subject: [PATCH] nmcli: fix "nmcli device monitor " Call get_device_list() after next_arg(); call it only after checking that there are other arguments after "monitor". Fixes: 6a3d77fbe6271bb632e5272ef49c58e30739c38e --- clients/cli/devices.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 750b4b022..64a75a07d 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -2417,9 +2417,6 @@ device_removed (NMClient *client, NMDevice *device, NmCli *nmc) static NMCResultCode do_devices_monitor (NmCli *nmc, int argc, char **argv) { - GSList *queue = get_device_list (nmc, argc, argv); - GSList *iter; - if (nmc->complete) return nmc->return_value; @@ -2436,6 +2433,9 @@ do_devices_monitor (NmCli *nmc, int argc, char **argv) nmc->should_wait++; g_signal_connect (nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK (device_added), nmc); } else { + GSList *queue = get_device_list (nmc, argc, argv); + GSList *iter; + /* Monitor the specified devices. */ for (iter = queue; iter; iter = g_slist_next (iter)) device_watch (nmc, NM_DEVICE (iter->data));