From 8f8345ef7df2fcf513d62542cb7f43c8dba61c2e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 4 Dec 2020 00:25:57 +0100
Subject: [PATCH] Fix admin logout messages for non-admin players.

Fixes #2616
---
 Content.Server/Administration/AdminManager.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Content.Server/Administration/AdminManager.cs b/Content.Server/Administration/AdminManager.cs
index 11bdef4955..cb8dc386a9 100644
--- a/Content.Server/Administration/AdminManager.cs
+++ b/Content.Server/Administration/AdminManager.cs
@@ -267,9 +267,7 @@ namespace Content.Server.Administration
             }
             else if (e.NewStatus == SessionStatus.Disconnected)
             {
-                _admins.Remove(e.Session);
-
-                if (_cfg.GetCVar(CCVars.AdminAnnounceLogout))
+                if (_admins.Remove(e.Session) && _cfg.GetCVar(CCVars.AdminAnnounceLogout))
                 {
                     _chat.SendAdminAnnouncement(Loc.GetString("Admin logout: {0}", e.Session.Name));
                 }