From 60a06e1f266dcf85642fe2e7a331e8375aff780a Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Wed, 9 Mar 2016 23:01:38 +0100 Subject: [PATCH] Reuse tagtarget and added comment --- src/fe-common/core/fe-common-core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 086421fc..9e4ddaa8 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -463,13 +463,14 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) return TRUE; if (dest->server_tag != NULL) { - char *tag = g_strdup_printf("%s/", dest->server_tag); - int ret = strarray_find(array, tag); - g_free(tag); + /* Check for network/ before network/#chan for network-wide activity_hide_targets */ + char *tagtarget = g_strdup_printf("%s/", dest->server_tag); + int ret = strarray_find(array, tagtarget); + g_free(tagtarget); if (ret != -1) return TRUE; - char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); + tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); ret = strarray_find(array, tagtarget); g_free(tagtarget); if (ret != -1)