From d6ce97e677182ce0967150ca908bae842847931e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 17 Aug 2007 21:31:59 +0000 Subject: [PATCH] 2007-08-17 Dan Williams * src/nm-device-802-3-ethernet.c - (real_bring_down): don't try to dispose of stuff that might not exist git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2712 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-3-ethernet.c | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d45298b91e..dfec5ee380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-17 Dan Williams + + * src/nm-device-802-3-ethernet.c + - (real_bring_down): don't try to dispose of stuff that might not + exist + 2007-08-17 Dan Williams * src/NetworkManagerAP.c diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index d953ff4dde..a93a88dcb2 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -216,15 +216,21 @@ real_bring_down (NMDevice *dev) NMNetlinkMonitor *monitor; sup_mgr = nm_supplicant_manager_get (); - nm_supplicant_manager_release_iface (sup_mgr, priv->sup_iface); - priv->sup_iface = NULL; + if (priv->sup_iface) { + nm_supplicant_manager_release_iface (sup_mgr, priv->sup_iface); + priv->sup_iface = NULL; + } g_object_unref (sup_mgr); monitor = nm_netlink_monitor_get (); - g_signal_handler_disconnect (monitor, priv->link_connected_id); - priv->link_connected_id = 0; - g_signal_handler_disconnect (monitor, priv->link_disconnected_id); - priv->link_disconnected_id = 0; + if (priv->link_connected_id) { + g_signal_handler_disconnect (monitor, priv->link_connected_id); + priv->link_connected_id = 0; + } + if (priv->link_disconnected_id) { + g_signal_handler_disconnect (monitor, priv->link_disconnected_id); + priv->link_disconnected_id = 0; + } g_object_unref (monitor); }