From 5f0e755a00c7cb0e85e167cd455bb3ce16b4d14b Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Wed, 23 Nov 2016 22:22:37 +0100 Subject: Don't shadow the 'channel' variable when printing the netjoins. This is the root cause of #567 --- src/fe-common/irc/fe-netjoin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/fe-common/irc/fe-netjoin.c') diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 79a8d5ec..4eb388c0 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -164,7 +164,7 @@ static void print_channel_netjoins(char *channel, TEMP_PRINT_REC *rec, g_free(channel); } -static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel) +static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channel) { TEMP_PRINT_REC *temp; GHashTable *channels; @@ -189,7 +189,9 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *channel) next2 = g_slist_next(tmp2); - if (channel != NULL && strcasecmp(realchannel, channel) != 0) + /* Filter the results by channel if asked to do so */ + if (filter_channel != NULL && + strcasecmp(realchannel, filter_channel) != 0) continue; temp = g_hash_table_lookup(channels, realchannel); -- cgit v1.2.3