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

when destroying channel, it really should be removed also from

Browse Source 
server->channels list.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2829 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-05-28 20:36:42 +00:00 committed by cras
parent 700df91429
commit 6871f558b5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/channels.c
View File

@ -77,8 +77,9 @@ void channel_destroy(CHANNEL_REC *channel)
channel->destroying = TRUE; channel->destroying = TRUE;
channels = g_slist_remove(channels, channel); channels = g_slist_remove(channels, channel);
if (!channel->server->disconnected) channel->server->channels =
channel->server->channels = g_slist_remove(channel->server->channels, channel); g_slist_remove(channel->server->channels, channel);
signal_emit("channel destroyed", 1, channel); signal_emit("channel destroyed", 1, channel);
MODULE_DATA_DEINIT(channel); MODULE_DATA_DEINIT(channel);

5
src/core/servers.c
View File

@ -361,15 +361,16 @@ int server_start_connect(SERVER_REC *server)
static int server_remove_channels(SERVER_REC *server) static int server_remove_channels(SERVER_REC *server)
{ {
GSList *tmp; GSList *tmp, *next;
int found; int found;
g_return_val_if_fail(server != NULL, FALSE); g_return_val_if_fail(server != NULL, FALSE);
found = FALSE; found = FALSE;
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) { for (tmp = server->channels; tmp != NULL; tmp = next) {
CHANNEL_REC *channel = tmp->data; CHANNEL_REC *channel = tmp->data;
next = tmp->next;
channel_destroy(channel); channel_destroy(channel);
found = TRUE; found = TRUE;
} }