From 8d5310c779479d5b2bf8246abe8b36afb84d4c93 Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Tue, 6 Jan 2026 21:52:39 -0600
Subject: [PATCH] feat(glue): pass login guid through s_loginGUID in
 CGlueMgr::PollEnterWorld

---
 src/glue/CGlueMgr.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/glue/CGlueMgr.cpp b/src/glue/CGlueMgr.cpp
index 0c579a0..96762f9 100644
--- a/src/glue/CGlueMgr.cpp
+++ b/src/glue/CGlueMgr.cpp
@@ -86,6 +86,12 @@ int32_t CGlueMgr::m_showedDisconnect;
 CSimpleTop* CGlueMgr::m_simpleTop;
 int32_t CGlueMgr::m_suspended;
 
+#if defined(WHOA_SYSTEM_WIN)
+static thread_local uint64_t s_loginGUID;
+#else
+static uint64_t s_loginGUID;
+#endif
+
 struct URLERROR {
     int32_t error;
     char url[32];
@@ -779,8 +785,7 @@ void CGlueMgr::PollEnterWorld() {
 
         SI2::StopGlueMusic(3.0f);
 
-        // TODO TLS shenanigans with guid
-        ClientServices::Connection()->CharacterLogin(CGlueMgr::m_characterInfo->m_info.guid, 0);
+        ClientServices::Connection()->CharacterLogin(s_loginGUID, 0);
 
         return;
     }
@@ -788,7 +793,8 @@ void CGlueMgr::PollEnterWorld() {
     uint32_t mapId = CGlueMgr::m_characterInfo->m_info.mapID;
     C3Vector position = CGlueMgr::m_characterInfo->m_info.position;
 
-    // TODO TLS shenanigans with guid
+    s_loginGUID = CGlueMgr::m_characterInfo->m_info.guid;
+
     // TODO first login logic (play intro M2?)
 
     CGlueMgr::Suspend();