mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
--hostname and --nick options didn't have effect for autoconnected servers.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1661 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
2bc284c77e
commit
35ce180f10
@ -344,20 +344,25 @@ static void autoconnect_servers(void)
|
|||||||
|
|
||||||
void fe_common_core_finish_init(void)
|
void fe_common_core_finish_init(void)
|
||||||
{
|
{
|
||||||
|
int setup_changed;
|
||||||
|
|
||||||
signal_emit("irssi init read settings", 0);
|
signal_emit("irssi init read settings", 0);
|
||||||
|
|
||||||
#ifdef SIGPIPE
|
#ifdef SIGPIPE
|
||||||
signal(SIGPIPE, SIG_IGN);
|
signal(SIGPIPE, SIG_IGN);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
setup_changed = FALSE;
|
||||||
if (cmdline_nick != NULL) {
|
if (cmdline_nick != NULL) {
|
||||||
/* override nick found from setup */
|
/* override nick found from setup */
|
||||||
settings_set_str("nick", cmdline_nick);
|
settings_set_str("nick", cmdline_nick);
|
||||||
|
setup_changed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmdline_hostname != NULL) {
|
if (cmdline_hostname != NULL) {
|
||||||
/* override host name found from setup */
|
/* override host name found from setup */
|
||||||
settings_set_str("hostname", cmdline_hostname);
|
settings_set_str("hostname", cmdline_hostname);
|
||||||
|
setup_changed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
create_windows();
|
create_windows();
|
||||||
@ -368,5 +373,8 @@ void fe_common_core_finish_init(void)
|
|||||||
G_LOG_LEVEL_WARNING),
|
G_LOG_LEVEL_WARNING),
|
||||||
(GLogFunc) glog_func, NULL);
|
(GLogFunc) glog_func, NULL);
|
||||||
|
|
||||||
|
if (setup_changed)
|
||||||
|
signal_emit("setup changed", 0);
|
||||||
|
|
||||||
autoconnect_servers();
|
autoconnect_servers();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user