From aa9234c68130018f4ee3dbb40f54758536e9d101 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 6 Feb 2017 16:00:01 -0500
Subject: [PATCH] Fix console forwarding with infoboxes

---
 ShiftOS_TheReturn/Commands.cs        | 4 ++++
 ShiftOS_TheReturn/TerminalBackend.cs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 1976ce3..2e70151 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -67,9 +67,11 @@ namespace ShiftOS.Engine
         public static bool ShowYesNo(Dictionary<string, object> args)
         {
             bool forwarding = TerminalBackend.IsForwardingConsoleWrites;
+            var fGuid = TerminalBackend.ForwardGUID;
             Action<bool> callback = (result) =>
             {
                 TerminalBackend.IsForwardingConsoleWrites = forwarding;
+                TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
                 string resultFriendly = (result == true) ? "yes" : "no";
                 Console.WriteLine($"{SaveSystem.CurrentSave.Username} says {resultFriendly}.");
                 TerminalBackend.IsForwardingConsoleWrites = false;
@@ -88,9 +90,11 @@ namespace ShiftOS.Engine
         public static bool ShowText(Dictionary<string, object> args)
         {
             bool forwarding = TerminalBackend.IsForwardingConsoleWrites;
+            var fGuid = TerminalBackend.ForwardGUID;
             Action<string> callback = (result) =>
             {
                 TerminalBackend.IsForwardingConsoleWrites = forwarding;
+                TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
                 Console.WriteLine($"{SaveSystem.CurrentSave.Username} says \"{result}\".");
                 TerminalBackend.IsForwardingConsoleWrites = false;
             };
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index 8a8828e..3c8e62a 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -317,7 +317,7 @@ namespace ShiftOS.Engine
         }
 
         public static bool IsForwardingConsoleWrites { get; internal set; }
-        public static string ForwardGUID { get; private set; }
+        public static string ForwardGUID { get; internal set; }
         
     }
 }