aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

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

Browse Source 
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
parent fddcbe56c9
commit bb7e81438d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fe-common/core/fe-common-core.c
View File

@ -486,9 +486,6 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE; strarray_find(array, dest->window->name) != -1 ? TRUE : FALSE;
item = window_item_find_window(dest->window, dest->server, dest->target); 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; server_tag_len = dest->server_tag != NULL ? strlen(dest->server_tag) : 0;
for (tmp = array; *tmp != NULL; tmp++) { for (tmp = array; *tmp != NULL; tmp++) {
@ -507,11 +504,11 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
return TRUE; return TRUE;
} else if (g_ascii_strcasecmp(str, dest->target) == 0) { } else if (g_ascii_strcasecmp(str, dest->target) == 0) {
return TRUE; return TRUE;
} else if (item->type == query_type && } else if (item != NULL && item->type == query_type &&
g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" : g_strcmp0(str, dest->target[0] == '=' ? "::dccqueries" :
"::queries") == 0) { "::queries") == 0) {
return TRUE; return TRUE;
} else if (item->type == channel_type && } else if (item != NULL && item->type == channel_type &&
g_strcmp0(str, "::channels") == 0) { g_strcmp0(str, "::channels") == 0) {
return TRUE; return TRUE;
} }