From: Jeff Halter <redacted>
Date: Sat, 25 Jun 2022 01:52:18 +0000 (-0700)
Subject: Fix panic on v1.2.3 login
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/590974641fde819128297803a12cfd4c744283a8?ds=inline;hp=-c

Fix panic on v1.2.3 login
---

590974641fde819128297803a12cfd4c744283a8
diff --git a/hotline/server.go b/hotline/server.go
index e5a7b8e..fd8bda6 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -626,6 +626,12 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 		return nil
 	}
 
+	if clientLogin.GetField(fieldUserIconID).Data != nil {
+		*c.Icon = clientLogin.GetField(fieldUserIconID).Data
+	}
+
+	c.Account = c.Server.Accounts[login]
+
 	if clientLogin.GetField(fieldUserName).Data != nil {
 		if c.Authorize(accessAnyName) {
 			c.UserName = clientLogin.GetField(fieldUserName).Data
@@ -634,12 +640,6 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 		}
 	}
 
-	if clientLogin.GetField(fieldUserIconID).Data != nil {
-		*c.Icon = clientLogin.GetField(fieldUserIconID).Data
-	}
-
-	c.Account = c.Server.Accounts[login]
-
 	if c.Authorize(accessDisconUser) {
 		*c.Flags = []byte{0, 2}
 	}