diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-29 22:57:44 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-29 22:57:44 +0100 |
| commit | 6451d2704fd0742680b485fb1d3690e251860073 (patch) | |
| tree | 202d800efb71c9c4a4c9e0fd9c2112323a9116ed /root_commands.c | |
| parent | 59cd92b87d700f943c789b0458c5d311f6fad86c (diff) | |
Move the check for "set auto_connect" to a more sensible location. #878.
Diffstat (limited to 'root_commands.c')
| -rw-r--r-- | root_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/root_commands.c b/root_commands.c index fcf6f66e..41b98a17 100644 --- a/root_commands.c +++ b/root_commands.c @@ -184,8 +184,7 @@ static void cmd_identify( irc_t *irc, char **cmd ) already sure that there's no takeover target (only possible in 1-process daemon mode). Start auto_connect immediately. */ - if( !ipc_child_identify( irc ) && load && - set_getbool( &irc->b->set, "auto_connect" ) ) + if( !ipc_child_identify( irc ) && load ) cmd_identify_finish( irc, 0, 0 ); break; @@ -201,7 +200,8 @@ gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond ) char *account_on[] = { "account", "on", NULL }; irc_t *irc = data; - cmd_account( irc, account_on ); + if( set_getbool( &irc->b->set, "auto_connect" ) ) + cmd_account( irc, account_on ); b_event_remove( irc->login_source_id ); irc->login_source_id = -1; |