From 5acdedd25a0ce52dc4c049d19e33735087544d92 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 31 Jul 2000 20:39:31 +0000 Subject: [PATCH] Never fallback to alternate_nick if nick is set in ircnet settings. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@559 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/irc/core/server-setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/irc/core/server-setup.c b/src/irc/core/server-setup.c index b6f41e31..c1dbc52b 100644 --- a/src/irc/core/server-setup.c +++ b/src/irc/core/server-setup.c @@ -142,7 +142,8 @@ create_addr_conn(const char *address, int port, const char *password, if (ircnet == NULL) return conn; if (ircnet->nick && !(nick && *nick)) { - g_free(conn->nick); + g_free_and_null(conn->alternate_nick); + g_free(conn->nick); conn->nick = g_strdup(ircnet->nick);; } if (ircnet->username) {