Merge pull request #625 from orium/network-name-improve

Improved server_get_network()

1 files changed, 5 insertions, 0 deletions

diff --git a/src/common/server.c b/src/common/server.c
index 3f7027e2..99e7563e 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -1903,9 +1903,14 @@ server_set_defaults (server *serv)
 char *
 server_get_network (server *serv, gboolean fallback)
 {
+	/* check the network list */
 	if (serv->network)
 		return ((ircnet *)serv->network)->name;
 
+	/* check the network name given in 005 NETWORK=... */
+	if (serv->server_session && *serv->server_session->channel)
+		return serv->server_session->channel;
+
 	if (fallback)
 		return serv->servername;