Merge pull request #1013 from ailin-nemui/fix-1012

do not stop autolog_ignore_targets from matching itemless targets

(cherry picked from commit df532d4461)
This commit is contained in:
ailin-nemui 2019-02-18 09:36:34 +01:00 committed by Ailin Nemui
commit 6b6e03c326

View file

@ -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;
}