mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
try to make sure the server is still good enough to call ischannel when printing netsplit/join
This commit is contained in:
parent
946876b1e9
commit
5c5ed64180
@ -245,17 +245,24 @@ static void print_netjoins(NETJOIN_SERVER_REC *server, const char *filter_channe
|
|||||||
message before it. */
|
message before it. */
|
||||||
static void sig_print_starting(TEXT_DEST_REC *dest)
|
static void sig_print_starting(TEXT_DEST_REC *dest)
|
||||||
{
|
{
|
||||||
GSList *tmp, *next;
|
NETJOIN_SERVER_REC *rec;
|
||||||
|
|
||||||
if (printing_joins)
|
if (printing_joins)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (tmp = joinservers; tmp != NULL; tmp = next) {
|
if (!IS_IRC_SERVER(dest->server))
|
||||||
NETJOIN_SERVER_REC *server = tmp->data;
|
return;
|
||||||
|
|
||||||
next = tmp->next;
|
rec = netjoin_find_server(IRC_SERVER(dest->server));
|
||||||
if (server->netjoins != NULL)
|
if (rec != NULL && rec->netjoins != NULL) {
|
||||||
print_netjoins(server, NULL);
|
/* if netjoins exists, the server rec should be
|
||||||
|
still valid. otherwise, calling server->ischannel
|
||||||
|
may not be safe. */
|
||||||
|
if (dest->target != NULL &&
|
||||||
|
!server_ischannel((SERVER_REC *) rec->server, dest->target))
|
||||||
|
return;
|
||||||
|
|
||||||
|
print_netjoins(rec, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,16 +247,23 @@ static int check_server_splits(IRC_SERVER_REC *server)
|
|||||||
message before it. */
|
message before it. */
|
||||||
static void sig_print_starting(TEXT_DEST_REC *dest)
|
static void sig_print_starting(TEXT_DEST_REC *dest)
|
||||||
{
|
{
|
||||||
GSList *tmp;
|
IRC_SERVER_REC *rec;
|
||||||
|
|
||||||
if (printing_splits)
|
if (printing_splits)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (tmp = servers; tmp != NULL; tmp = tmp->next) {
|
if (!IS_IRC_SERVER(dest->server))
|
||||||
IRC_SERVER_REC *rec = tmp->data;
|
return;
|
||||||
|
|
||||||
if (IS_IRC_SERVER(rec) && rec->split_servers != NULL)
|
rec = IRC_SERVER(dest->server);
|
||||||
print_splits(rec, NULL);
|
if (rec->split_servers != NULL) {
|
||||||
|
/* if split_servers exists, the server rec should be
|
||||||
|
still valid. otherwise, calling server->ischannel
|
||||||
|
may not be safe. */
|
||||||
|
if (dest->target != NULL && !server_ischannel((SERVER_REC *) rec, dest->target))
|
||||||
|
return;
|
||||||
|
|
||||||
|
print_splits(rec, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user