Fix panic on v1.2.3 login

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index e5a7b8eb08a4ed8be7c0fce1555e7839264a8587..fd8bda6c451bc3a7612946e9c7e9dda7c2877f3a 100644 (file)
--- 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}
        }