Fix race condition causing disconnected admins to appear in adminwho (s…

…pace-wizards#34033)
DebugOk · Dec 24, 2024 · 285e934 · 285e934
1 parent 2c4be6b
commit 285e934
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
@@ -408,6 +408,17 @@ private async void LoginAdminMaybe(ICommonSession session)
         }
 
         private async Task<(AdminData dat, int? rankId, bool specialLogin)?> LoadAdminData(ICommonSession session)
+        {
+            var result = await LoadAdminDataCore(session);
+
+            // Make sure admin didn't disconnect while data was loading.
+            if (session.Status != SessionStatus.InGame)
+                return null;
+
+            return result;
+        }
+
+        private async Task<(AdminData dat, int? rankId, bool specialLogin)?> LoadAdminDataCore(ICommonSession session)
         {
             var promoteHost = IsLocal(session) && _cfg.GetCVar(CCVars.ConsoleLoginLocal)
                               || _promotedPlayers.Contains(session.UserId)