From 812d832597acd6ffb6589179e9c763b9e3321534 Mon Sep 17 00:00:00 2001
From: SaberShip <sabership.noreply@github.com>
Date: Sat, 21 Sep 2024 00:48:34 -0500
Subject: [PATCH] Display correct faction name in trade UI

---
 Source/Client/Persistent/TradingUI.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Client/Persistent/TradingUI.cs b/Source/Client/Persistent/TradingUI.cs
index 8e9d5168..0bdb6008 100644
--- a/Source/Client/Persistent/TradingUI.cs
+++ b/Source/Client/Persistent/TradingUI.cs
@@ -67,8 +67,10 @@ public override void DoWindowContents(Rect inRect)
                 selectedSession = session.SessionId;
             }
 
+            Faction factionContext = session.NegotiatorFaction;
             try
             {
+                factionContext = FactionContext.Push(factionContext);
                 MpTradeSession.SetTradeSession(session);
                 drawingTrade = this;
 
@@ -124,6 +126,9 @@ public override void DoWindowContents(Rect inRect)
             {
                 drawingTrade = null;
                 MpTradeSession.SetTradeSession(null);
+                if (factionContext != null) {
+                    FactionContext.Pop();
+                }
             }
         }