From: Lubomir Rintel Date: Tue, 29 Mar 2016 11:50:39 +0000 (+0200) Subject: device: drop external changes on Reapply X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=NetworkManager.git;a=commitdiff_plain;h=2c2662f7724a4e74994359a34684947fac7c8bae device: drop external changes on Reapply https://bugzilla.gnome.org/show_bug.cgi?id=762322 --- diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 33d33fa97..529b3cd82 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7140,6 +7140,7 @@ nm_device_reactivate_ip4_config (NMDevice *self, if (priv->ip4_state != IP_NONE) { g_clear_object (&priv->con_ip4_config); + g_clear_object (&priv->ext_ip4_config); priv->con_ip4_config = nm_ip4_config_new (nm_device_get_ip_ifindex (self)); nm_ip4_config_merge_setting (priv->con_ip4_config, s_ip4_new, @@ -7170,6 +7171,7 @@ nm_device_reactivate_ip6_config (NMDevice *self, if (priv->ip6_state != IP_NONE) { g_clear_object (&priv->con_ip6_config); + g_clear_object (&priv->ext_ip6_config); priv->con_ip6_config = nm_ip6_config_new (nm_device_get_ip_ifindex (self)); nm_ip6_config_merge_setting (priv->con_ip6_config, s_ip6_new,