From 5be5d14890490ac7d919a3e17be3bcd98dc231a8 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 18 May 2002 05:59:13 +0000 Subject: Stop reconnecting on kills only if the kill was done by operator, not server. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2813 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/irc/core/irc-servers-reconnect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/irc/core') diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c index f2cbf7f0..b8da95f5 100644 --- a/src/irc/core/irc-servers-reconnect.c +++ b/src/irc/core/irc-servers-reconnect.c @@ -90,10 +90,11 @@ static void event_nick_collision(IRC_SERVER_REC *server, const char *data) server->nick_collision = TRUE; } -static void event_kill(IRC_SERVER_REC *server, const char *data) +static void event_kill(IRC_SERVER_REC *server, const char *data, + const char *nick, const char *addr) { - if (!server->nick_collision) { - /* don't reconnect if we were killed */ + if (addr != NULL && !server->nick_collision) { + /* don't reconnect if we were killed by an oper (not server) */ server->no_reconnect = TRUE; } } -- cgit v1.2.3