From 84763003740584de738da5cede21cfd0f626c49f Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Wed, 9 Mar 2016 22:23:46 +0100 Subject: [PATCH] Check for tag/ before tag/#channel for network-wide activity_hide_targets --- src/fe-common/core/fe-common-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index ee7f9424..086421fc 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -463,8 +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); + if (ret != -1) + return TRUE; + char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); - int ret = strarray_find(array, tagtarget); + ret = strarray_find(array, tagtarget); g_free(tagtarget); if (ret != -1) return TRUE;