diff options
| author | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
| commit | 5bebd4411bc6266cbee482a429ba794eefa8f9b6 (patch) | |
| tree | a68282dda40c4f0b28883241c7adcf9010f4550e /ShiftOS_TheReturn/ServerManager.cs | |
| parent | 8e19c8599975685410d7508b150f811dc3991f4a (diff) | |
| parent | 6f5e69bd9df3bd44c098a179458fd37ca6114685 (diff) | |
| download | shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.gz shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.bz2 shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ShiftOS.WinForms/ShiftOS.WinForms.csproj
Diffstat (limited to 'ShiftOS_TheReturn/ServerManager.cs')
| -rw-r--r-- | ShiftOS_TheReturn/ServerManager.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs index df3e463..66a0d37 100644 --- a/ShiftOS_TheReturn/ServerManager.cs +++ b/ShiftOS_TheReturn/ServerManager.cs @@ -89,6 +89,8 @@ Ping: {ServerManager.DigitalSocietyPing} ms /// </summary> public static Guid thisGuid { get; private set; } + public static AutoResetEvent guidReceiveARE = new AutoResetEvent(false); + /// <summary> /// Gets the underlying NetSockets client for this connection. /// </summary> @@ -241,6 +243,7 @@ Ping: {ServerManager.DigitalSocietyPing} ms { thisGuid = new Guid(msg.Contents); GUIDReceived?.Invoke(msg.Contents); + guidReceiveARE.Set(); TerminalBackend.PrefixEnabled = true; TerminalBackend.PrintPrompt(); } |