From a6f28f402b5b7df2be1eb1ed3d778fcf7076b473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 28 Jun 2013 14:04:29 +0200 Subject: [PATCH] core: set GError on failure in nm_manager_deactivate_connection() (rh #976627) It fixes NM crash (abort) when VPN connection can't be disconnected. --- src/nm-manager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c index 52bab8147e..195faa96ad 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3220,6 +3220,9 @@ nm_manager_deactivate_connection (NMManager *manager, vpn_reason = NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED; if (nm_vpn_manager_deactivate_connection (priv->vpn_manager, NM_VPN_CONNECTION (active), vpn_reason)) success = TRUE; + else + g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, + "The VPN connection was not active."); } else { g_assert (NM_IS_ACT_REQUEST (active)); /* FIXME: use DEACTIVATING state */