degesch: make /disconnect abort reconnect timer

This commit is contained in:
Přemysl Eric Janouch 2015-07-11 17:54:49 +02:00
parent 0c4b727961
commit b3876260b9

View File

@ -7374,6 +7374,11 @@ handle_command_disconnect (struct handler_args *a)
log_server_status (s, s->buffer, "Connecting aborted"); log_server_status (s, s->buffer, "Connecting aborted");
irc_destroy_connector (s); irc_destroy_connector (s);
} }
else if (poller_timer_is_active (&s->reconnect_tmr))
{
log_server_status (s, s->buffer, "Connecting aborted");
poller_timer_reset (&s->reconnect_tmr);
}
else if (!irc_is_connected (s)) else if (!irc_is_connected (s))
log_server_error (s, s->buffer, "Not connected"); log_server_error (s, s->buffer, "Not connected");
else else