From 217c697dc169dccbf8ebf65dd5fa360873ea9ccb Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 30 Jun 2008 20:19:42 +0000 Subject: [PATCH] Ensure transition to UNAVAILABLE when supplicant goes away git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3787 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- src/nm-device-wifi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index bcc6225826..7a40cf7b64 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -2240,10 +2240,10 @@ supplicant_mgr_state_cb_handler (gpointer user_data) if (priv->supplicant.iface) { cleanup_association_attempt (self, FALSE); supplicant_interface_release (self); - - if (nm_device_is_activating (dev)) - nm_device_state_changed (dev, NM_DEVICE_STATE_UNAVAILABLE); } + + if (nm_device_get_state (dev) > NM_DEVICE_STATE_UNAVAILABLE) + nm_device_state_changed (dev, NM_DEVICE_STATE_UNAVAILABLE); } else if (new_state == NM_SUPPLICANT_MANAGER_STATE_IDLE) { dev_state = nm_device_get_state (dev); if ( priv->enabled