FIx icon ID

diff --git a/client.go b/client.go
index 0c8cdb025ec90f2c7b589f5ba55deb76a8c02e3d..2f79552885ef87cd95f607ae29562d7a200d8a8c 100644 (file)
--- a/client.go
+++ b/client.go
@@ -44,6 +44,12 @@ type ClientPrefs struct {
        Tracker   string     `yaml:"Tracker"`
 }
 
+func (cp *ClientPrefs) IconBytes() []byte {
+       iconBytes := make([]byte, 2)
+       binary.BigEndian.PutUint16(iconBytes, uint16(cp.IconID))
+       return iconBytes
+}
+
 func readConfig(cfgPath string) (*ClientPrefs, error) {
        fh, err := os.Open(cfgPath)
        if err != nil {
@@ -717,7 +723,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
                                        *NewTransaction(
                                                tranAgreed, nil,
                                                NewField(fieldUserName, []byte(c.pref.Username)),
-                                               NewField(fieldUserIconID, *c.Icon),
+                                               NewField(fieldUserIconID, c.pref.IconBytes()),
                                                NewField(fieldUserFlags, []byte{0x00, 0x00}),
                                                NewField(fieldOptions, []byte{0x00, 0x00}),
                                        ),
@@ -726,7 +732,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
                                c.UI.Pages.HidePage("agreement")
                                c.UI.App.SetFocus(c.UI.chatInput)
                        } else {
-                               c.Disconnect()
+                               _ = c.Disconnect()
                                c.UI.Pages.SwitchToPage("home")
                        }
                },
@@ -838,7 +844,7 @@ func (c *Client) LogIn(login string, password string) error {
                *NewTransaction(
                        tranLogin, nil,
                        NewField(fieldUserName, []byte(c.pref.Username)),
-                       NewField(fieldUserIconID, []byte{0x07, 0xd1}),
+                       NewField(fieldUserIconID, c.pref.IconBytes()),
                        NewField(fieldUserLogin, []byte(NegatedUserString([]byte(login)))),
                        NewField(fieldUserPassword, []byte(NegatedUserString([]byte(password)))),
                        NewField(fieldVersion, []byte{0, 2}),

diff --git a/client/mobius-client-config.yaml b/client/mobius-client-config.yaml
index 868797cfd14414b5cb66b95f0cf165d0a2b92f59..978122bfc8fed8457115ac327e909756c6a82e75 100644 (file)
--- a/client/mobius-client-config.yaml
+++ b/client/mobius-client-config.yaml
@@ -1,5 +1,5 @@
 Username: unnamed
-IconID: 2000
+IconID: 414
 Tracker: hltracker.com:5498
 Bookmarks:
   - Name: Example Server