diff options
| author | Michael <[email protected]> | 2017-01-21 19:10:58 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-01-21 19:10:58 -0500 |
| commit | 84be879805ab7ad4a6934275ef3d3a0250b70cfc (patch) | |
| tree | c773e4f2c9e9e5219bd37a6f301d16ed598d7c40 | |
| parent | e78caeaeff792fb2c68d361fb5eccd96a44907ac (diff) | |
| download | shiftos_thereturn-84be879805ab7ad4a6934275ef3d3a0250b70cfc.tar.gz shiftos_thereturn-84be879805ab7ad4a6934275ef3d3a0250b70cfc.tar.bz2 shiftos_thereturn-84be879805ab7ad4a6934275ef3d3a0250b70cfc.zip | |
Fix trm handshake accept
| -rw-r--r-- | ShiftOS.Server/Program.cs | 4 | ||||
| -rw-r--r-- | 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; |