summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-10-04 14:30:57 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-10-04 15:50:44 +0200
commit24a7f88bc56b66745c1e6b9444df8a80125de059 (patch)
treeab5d125bf064822ba3bab352bb5bd03f1a8d275b
parent7845423881cbc98ab787f3185205345de8481bf7 (diff)
downloadNetworkManager-24a7f88bc56b66745c1e6b9444df8a80125de059.tar.gz
device: fix frozen notify signals on unrealize error path
If unrealize() failed we returned without thawing notify signals. Fix this by moving g_object_freeze_notify() after the unrealization/deletion but before the properties are reset in unrealize_notify(). Fixes: a93807c288743f499362f7edfe0674020762811c
-rw-r--r--src/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index cf73ee016a..435eeee2d7 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -3431,7 +3431,6 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
g_return_val_if_fail (priv->iface != NULL, FALSE);
g_return_val_if_fail (priv->real, FALSE);
- g_object_freeze_notify (G_OBJECT (self));
ifindex = nm_device_get_ifindex (self);
@@ -3448,6 +3447,7 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
}
}
+ g_object_freeze_notify (G_OBJECT (self));
NM_DEVICE_GET_CLASS (self)->unrealize_notify (self);
_parent_set_ifindex (self, 0, FALSE);