forked from PsychoticNinja/irssi
Don't stop reconnecting to server if we get nick collided
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2408 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
3990779dc5
commit
c674db5c8e
@ -86,13 +86,17 @@ static void event_nick_collision(IRC_SERVER_REC *server, const char *data)
|
|||||||
settings_get_int("server_reconnect_time");
|
settings_get_int("server_reconnect_time");
|
||||||
if (server->connect_time > new_connect)
|
if (server->connect_time > new_connect)
|
||||||
server->connect_time = new_connect;
|
server->connect_time = new_connect;
|
||||||
|
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
|
if (!server->nick_collision) {
|
||||||
/* don't reconnect if we were killed */
|
/* don't reconnect if we were killed */
|
||||||
server->no_reconnect = TRUE;
|
server->no_reconnect = TRUE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void irc_servers_reconnect_init(void)
|
void irc_servers_reconnect_init(void)
|
||||||
{
|
{
|
||||||
|
@ -59,6 +59,7 @@ struct _IRC_SERVER_REC {
|
|||||||
unsigned int no_multi_who:1; /* Server doesn't understand WHO #chan1,#chan2,... */
|
unsigned int no_multi_who:1; /* Server doesn't understand WHO #chan1,#chan2,... */
|
||||||
unsigned int one_endofwho:1; /* /WHO #a,#b,.. replies only with one End of WHO message */
|
unsigned int one_endofwho:1; /* /WHO #a,#b,.. replies only with one End of WHO message */
|
||||||
unsigned int disable_lag:1; /* Disable lag detection (PING command doesn't exist) */
|
unsigned int disable_lag:1; /* Disable lag detection (PING command doesn't exist) */
|
||||||
|
unsigned int nick_collision:1; /* We're just now being killed because of nick collision */
|
||||||
|
|
||||||
int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
|
int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
|
||||||
int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */
|
int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user