mirror of
https://github.com/irssi/irssi.git
synced 2026-08-22 18:12:12 +02:00
Merge cf3361e5fd into c890ecafa0
This commit is contained in:
commit
ff450a0b9e
4 changed files with 6 additions and 2 deletions
|
|
@ -445,6 +445,8 @@ static int server_remove_channels(SERVER_REC *server)
|
|||
CHANNEL_REC *channel = tmp->data;
|
||||
|
||||
next = tmp->next;
|
||||
/* mark all the channels as parted */
|
||||
channel->left = TRUE;
|
||||
channel_destroy(channel);
|
||||
found = TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ void window_destroy(WINDOW_REC *window)
|
|||
void window_auto_destroy(WINDOW_REC *window)
|
||||
{
|
||||
if (settings_get_bool("autoclose_windows") && windows->next != NULL &&
|
||||
window->items == NULL && window->bound_items == NULL &&
|
||||
window->items == NULL && window_bind_has_sticky(window) == FALSE &&
|
||||
window->level == 0 && !window->immortal)
|
||||
window_destroy(window);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ WI_ITEM_REC *window_item_find(void *server, const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int window_bind_has_sticky(WINDOW_REC *window)
|
||||
int window_bind_has_sticky(WINDOW_REC *window)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ WI_ITEM_REC *window_item_find(void *server, const char *name);
|
|||
WI_ITEM_REC *window_item_find_window(WINDOW_REC *window,
|
||||
void *server, const char *name);
|
||||
|
||||
int window_bind_has_sticky(WINDOW_REC *window);
|
||||
|
||||
void window_items_init(void);
|
||||
void window_items_deinit(void);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue