From 47d8bffbd53d450cdf1387f68dd8dc120b79064e Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 23 Apr 2019 22:24:36 +0200 Subject: cli: don't wait for connection change on update failure When saving a connection, we wait the connection-changed signal before proceeding to ensure that the remote connection is up to date. However, no signal is emitted if the update fails and so we shouldn't wait for it. Fixes: a370faeb59a9 ('cli: wait for changed signal after updating a connection'): https://bugzilla.redhat.com/show_bug.cgi?id=1702203 --- clients/cli/connections.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 0abbe8358f..2c4b8d2478 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -7814,8 +7814,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t while (!nmc_editor_cb_called && !timeout) g_main_context_iteration (NULL, TRUE); - while (!connection_changed && !timeout) - g_main_context_iteration (NULL, TRUE); + if (!nmc_editor_error) { + while (!connection_changed && !timeout) + g_main_context_iteration (NULL, TRUE); + } if (handler_id) g_signal_handler_disconnect (rem_con, handler_id); -- cgit v1.2.1