From 84be879805ab7ad4a6934275ef3d3a0250b70cfc Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sat, 21 Jan 2017 19:10:58 -0500
Subject: [PATCH] Fix trm handshake accept

---
 ShiftOS.Server/Program.cs            | 4 ++--
 ShiftOS_TheReturn/TerminalBackend.cs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs
index d8d953e..6c6d1da 100644
--- a/ShiftOS.Server/Program.cs
+++ b/ShiftOS.Server/Program.cs
@@ -294,9 +294,9 @@ Contents:
                         }));
                         break;
                     case "trm_handshake_accept":
-                        if(args["guid"] != null)
+                        if(args["guid"] != null && args["target"] != null)
                         {
-                            server.DispatchTo(new Guid(msg.GUID), new NetObject("hold_it", new ServerMessage
+                            server.DispatchTo(new Guid(args["target"] as string), new NetObject("hold_it", new ServerMessage
                             {
                                 Name = "trm_handshake_guid",
                                 GUID = args["guid"] as string
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index 0d2f386..de9e179 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -279,7 +279,8 @@ namespace ShiftOS.Engine
                     {
                         ForwardGUID = guid;
                         ServerManager.SendMessage("trm_handshake_accept", $@"{{
-    guid: ""{ServerManager.thisGuid}""
+    guid: ""{ServerManager.thisGuid}"",
+    target: ""{guid}""
 }}");
 
                         IsForwardingConsoleWrites = true;