NanoChat fixes

Simple-Station · Dec 30, 2024 · 60382e2 · 60382e2
1 parent 471c3c2
commit 60382e2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/DeltaV/NanoChat/SharedNanoChatSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Content.Shared.Examine;
+using Content.Shared.PDA;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.DeltaV.NanoChat;
@@ -10,6 +11,7 @@ namespace Content.Shared.DeltaV.NanoChat;
 public abstract class SharedNanoChatSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
 
     public override void Initialize()
     {
@@ -139,6 +141,10 @@ public void AddMessage(Entity<NanoChatCardComponent?> card, uint recipientNumber
         if (!Resolve(card, ref card.Comp))
             return null;
 
+        // If the UI is not open, no one is technically selected.
+        if (!_ui.IsUiOpen(card.Owner, PdaUiKey.Key))
+            return null;
+
         return card.Comp.CurrentChat;
     }