aboutsummaryrefslogtreecommitdiffstats
path: root/root_commands.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-07-11 11:59:56 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2010-07-11 11:59:56 +0100
commitaf9f2ca883354a47635d130ff5e7bd693a200a29 (patch)
treeb048cd3da23394f98fb00406daf25d49f2960702 /root_commands.c
parent1e52e1ff518987092cfe94bc5c9c4479ed535019 (diff)
Added allow_takeover setting for people who don't like this new functionality.
Diffstat (limited to 'root_commands.c')
-rw-r--r--root_commands.c5
1 files changed, 1 insertions, 4 deletions
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;
}