From 5f297950a2ec399bfa9bc2163133e8fd948f421c Mon Sep 17 00:00:00 2001 From: TingPing Date: Fri, 18 Apr 2014 20:40:16 -0400 Subject: Fix issues removing autojoin channels - Makes remove case insensitive - Fixes crashing when channel not found --- src/common/servlist.c | 2 +- src/fe-gtk/servlistgui.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index 85dfc896..ec3889ff 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -842,7 +842,7 @@ servlist_favchan_find (ircnet *net, char *channel, int *pos) while (list) { favchan = list->data; - if (strcmp (favchan->name, channel) == 0) + if (g_ascii_strcasecmp (favchan->name, channel) == 0) { if (pos) { diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 389607d0..c72c5af3 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1088,8 +1088,11 @@ servlist_autojoinedit (ircnet *net, char *channel, gboolean add) else { fav = servlist_favchan_find (net, channel, NULL); - servlist_favchan_remove (net, fav); - servlist_save (); + if (fav) + { + servlist_favchan_remove (net, fav); + servlist_save (); + } } } -- cgit 1.4.1