summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-09-28 01:31:52 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-09-28 01:31:52 +0000
commit6dd07c76cb627ac2945e1c8ef218c56f8d4b4895 (patch)
tree29dd6639edae699e599b27a65aff71a235977efc /src
parentc91e8f98a40fccce31a02238cdd24d57f3e940c9 (diff)
downloadirssi-6dd07c76cb627ac2945e1c8ef218c56f8d4b4895.zip
fixes for multiprotocol support
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@692 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
-rw-r--r--src/fe-common/irc/fe-netsplit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index 7bb31612..6113a740 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -162,6 +162,8 @@ static int check_server_splits(IRC_SERVER_REC *server)
GSList *tmp, *next, *servers;
time_t last;
+ g_return_val_if_fail(IS_IRC_SERVER(server), FALSE);
+
last = get_last_split(server);
if (time(NULL)-last < SPLIT_WAIT_TIME)
return FALSE;
@@ -207,6 +209,9 @@ static int sig_check_splits(void)
for (tmp = servers; tmp != NULL; tmp = tmp->next) {
IRC_SERVER_REC *rec = tmp->data;
+ if (!IS_IRC_SERVER(rec))
+ continue;
+
if (rec->split_servers != NULL) {
if (!check_server_splits(rec))
stop = FALSE;
@@ -242,7 +247,7 @@ static void split_print(const char *nick, NETSPLIT_REC *rec)
/* SYNTAX: NETSPLIT */
static void cmd_netsplit(const char *data, IRC_SERVER_REC *server)
{
- if (server == NULL || !server->connected)
+ if (!IS_IRC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
if (server->split_servers == NULL) {