From 2ac059c37ae3b264aa965b6b012ec6c743f726e7 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 7 Nov 2021 23:33:52 +1300
Subject: [PATCH] fix examine bug (#5205)

---
 Content.Client/Examine/ExamineSystem.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 8ec345f984..c44e9e8d7a 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -73,19 +73,19 @@ namespace Content.Client.Examine
 
         private bool HandleExamine(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
         {
-            if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out _examinedEntity))
+            if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var entity))
             {
                 return false;
             }
 
             _playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
 
-            if (_playerEntity == null || !CanExamine(_playerEntity, _examinedEntity))
+            if (_playerEntity == null || !CanExamine(_playerEntity, entity))
             {
                 return false;
             }
 
-            DoExamine(_examinedEntity);
+            DoExamine(entity);
             return true;
         }
 
@@ -107,6 +107,9 @@ namespace Content.Client.Examine
             // Close any examine tooltip that might already be opened
             CloseTooltip();
 
+            // cache entity for Update function
+            _examinedEntity = entity;
+
             const float minWidth = 300;
             var popupPos = _userInterfaceManager.MousePositionScaled;