From 9603248a5bee98ce25a9d6361f3f3f89b3033441 Mon Sep 17 00:00:00 2001
From: TingPing <tngpng@gmail.com>
Date: Mon, 22 Apr 2013 07:30:33 -0300
Subject: [PATCH] Fall back to global username for sasl

---
 src/common/servlist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/servlist.c b/src/common/servlist.c
index 306b42e8..a87cc719 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -634,11 +634,11 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
 		safe_strcpy (serv->password, net->pass, sizeof (serv->password));
 	}
 
-	if (net->flags & FLAG_USE_GLOBAL)
+	if (net->flags & FLAG_USE_GLOBAL || net->user == NULL)
 	{
 		strcpy (serv->sasluser, prefs.hex_irc_user_name);
 	}
-	else if (net->user != NULL)
+	else
 	{
 		safe_strcpy (serv->sasluser, net->user, sizeof (serv->sasluser));
 	}