From af9f2ca883354a47635d130ff5e7bd693a200a29 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 11 Jul 2010 11:59:56 +0100 Subject: Added allow_takeover setting for people who don't like this new functionality. --- root_commands.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'root_commands.c') diff --git a/root_commands.c b/root_commands.c index 4aeb1470..d19feae0 100644 --- a/root_commands.c +++ b/root_commands.c @@ -174,11 +174,7 @@ static void cmd_identify( irc_t *irc, char **cmd ) immediately. */ if( !ipc_child_identify( irc ) && load && set_getbool( &irc->b->set, "auto_connect" ) ) - { - b_event_remove( irc->login_source_id ); - irc->login_source_id = -1; cmd_identify_finish( irc, 0, 0 ); - } break; case STORAGE_OTHER_ERROR: @@ -195,6 +191,7 @@ gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond ) cmd_account( irc, account_on ); + b_event_remove( irc->login_source_id ); irc->login_source_id = -1; return FALSE; } -- cgit v1.2.3