diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-21 23:14:14 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-21 23:14:14 +0100 |
| commit | e1aaea4357d61557c5d6be99fa3e5a9b3a55f784 (patch) | |
| tree | 48dae6b87e2c56bdc4d674bafd00eb86a119fb9a | |
| parent | 79b5c41187f04cc50a634ebe681e06340869e387 (diff) | |
Fixed Ping Timeout on connection takeover (bug #692).
| -rw-r--r-- | irc.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -196,7 +196,8 @@ void irc_abort( irc_t *irc, int immed, char *format, ... ) va_end( params ); } - irc_write( irc, "ERROR :Closing link: %s", reason ? : "" ); + if( reason ) + irc_write( irc, "ERROR :Closing link: %s", reason ); ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n", irc->user->nick ? irc->user->nick : "(NONE)", @@ -709,6 +710,9 @@ void irc_sync( irc_t *irc ) if( ic->flags & IRC_CHANNEL_JOINED ) irc_send_join( ic, irc->user ); } + + /* We may be waiting for a PONG from the previous client connection. */ + irc->pinging = FALSE; } void irc_desync( irc_t *irc ) |