aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-08 04:26:01 -04:00
Code

"window changed" signal handler didn't check if the old or new window

Browse Source 
is NULL.

window_has_query()


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@351 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-15 18:33:08 +00:00 committed by cras
parent df2ad566d8
commit 09e20e1d78
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fe-common/irc/fe-query.c
View File

@ -131,6 +131,8 @@ static int window_has_query(WINDOW_REC *window)
{ {
GSList *tmp; GSList *tmp;
g_return_val_if_fail(window != NULL, FALSE);
for (tmp = window->items; tmp != NULL; tmp = tmp->next) { for (tmp = window->items; tmp != NULL; tmp = tmp->next) {
if (irc_item_query(tmp->data)) if (irc_item_query(tmp->data))
return TRUE; return TRUE;
@ -147,9 +149,9 @@ static void sig_window_changed(WINDOW_REC *window, WINDOW_REC *old_window)
/* reset the window's last_line timestamp so that query doesn't get /* reset the window's last_line timestamp so that query doesn't get
closed immediately after switched to the window, or after changed closed immediately after switched to the window, or after changed
to some other window from it */ to some other window from it */
if (window_has_query(window)) if (window != NULL && window_has_query(window))
window->last_line = time(NULL); window->last_line = time(NULL);
if (window_has_query(old_window)) if (old_window != NULL && window_has_query(old_window))
old_window->last_line = time(NULL); old_window->last_line = time(NULL);
} }