From dc92660e6c399f88b461616b19618fdc3d5dc86c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 18 Jan 2008 02:58:25 +0000 Subject: [PATCH] 2008-01-17 Dan Williams * src/nm-device-802-11-wireless.c - (real_check_connection_conflicts): ignore connections that aren't wireless connections git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3243 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3af433897..22f391aea3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-17 Dan Williams + + * src/nm-device-802-11-wireless.c + - (real_check_connection_conflicts): ignore connections that aren't + wireless connections + 2008-01-17 Dan Williams * src/NetworkManagerPolicy.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 188d301b30..a6609df70c 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -814,10 +814,12 @@ real_check_connection_conflicts (NMDevice *device, g_assert (system_s_con); s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS)); - g_assert (s_wireless); + if (!s_wireless) + return FALSE; system_s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (system_connection, NM_TYPE_SETTING_WIRELESS)); - g_assert (system_s_wireless); + if (!system_s_wireless) + return FALSE; if (!system_s_con->lockdown) return FALSE;