From c41be469ab107ea2b4813bf28a1618572b78aa6a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 6 Oct 2015 14:18:48 +0200 Subject: device: assert that master-ready handler is not scheduled in schedule_stage2_device_config() --- src/devices/nm-device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index a862fe47a4..0bede2c3d3 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3056,9 +3056,10 @@ nm_device_activate_schedule_stage2_device_config (NMDevice *self) if (!priv->master_ready_handled) { NMActiveConnection *active = NM_ACTIVE_CONNECTION (priv->act_request); - if (!nm_active_connection_get_master (active)) + if (!nm_active_connection_get_master (active)) { + g_warn_if_fail (!priv->master_ready_id); priv->master_ready_handled = TRUE; - else { + } else { /* If the master connection is ready for slaves, attach ourselves */ if (nm_active_connection_get_master_ready (active)) master_ready (self, active); -- cgit v1.2.1