diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-05-18 05:59:13 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-05-18 05:59:13 +0000 |
| commit | 5be5d14890490ac7d919a3e17be3bcd98dc231a8 (patch) | |
| tree | ce891ae8ea70d5f1b92e562df36b6abbfa929b9b /src/irc/core | |
| parent | 1d10483021cc6eaa3cc30de7bd518c9606b62e50 (diff) | |
| download | irssi-5be5d14890490ac7d919a3e17be3bcd98dc231a8.zip | |
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
Diffstat (limited to 'src/irc/core')
| -rw-r--r-- | src/irc/core/irc-servers-reconnect.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } } |