diff options
| author | Jeff Halter <868228+jhalter@users.noreply.github.com> | 2022-06-24 18:52:18 -0700 |
|---|---|---|
| committer | Jeff Halter <868228+jhalter@users.noreply.github.com> | 2022-06-24 18:52:18 -0700 |
| commit | 590974641fde819128297803a12cfd4c744283a8 (patch) | |
| tree | 4d0ec849b6f4381cba874533936064cd0cbff209 | |
| parent | 3a3f91b2ccced90fcc2492ce54546d493f66db5e (diff) | |
Fix panic on v1.2.3 login
| -rw-r--r-- | hotline/server.go | 12 |
1 files changed, 6 insertions, 6 deletions
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} } |