From 6b6e03c326b32f379eb3d9e120f482c336d1f1cb Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Mon, 18 Feb 2019 09:36:34 +0100 Subject: [PATCH] Merge pull request #1013 from ailin-nemui/fix-1012 do not stop autolog_ignore_targets from matching itemless targets (cherry picked from commit df532d4461fa0e1aba8672fa6d56e3056ce52272) --- src/fe-common/core/fe-common-core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 209c2d9e..257976b1 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -483,9 +483,6 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) g_return_val_if_fail(dest->target != NULL, FALSE); item = window_item_find_window(dest->window, dest->server, dest->target); - if (item == NULL) { - return FALSE; - } server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0; for (tmp = array; *tmp != NULL; tmp++) { @@ -504,11 +501,11 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) return TRUE; } else if (g_ascii_strcasecmp(str, dest->target) == 0) { return TRUE; - } else if (item->type == query_type && + } else if (item != NULL && item->type == query_type && g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" : "::queries") == 0) { return TRUE; - } else if (item->type == channel_type && + } else if (item != NULL && item->type == channel_type && g_strcmp0(str, "::channels") == 0) { return TRUE; }