From 37df6e6a1178b55ca4d4913d2ba32c7d1d29f6a1 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 27 Feb 2020 00:16:39 +0100 Subject: [PATCH] Update submodule and fix race condition in wire component init --- Content.Server/GameObjects/Components/WiresComponent.cs | 5 +++++ RobustToolbox | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index 587cb159cb..18510e6908 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -114,6 +114,11 @@ namespace Content.Server.GameObjects.Components _userInterface = Owner.GetComponent() .GetBoundUserInterface(WiresUiKey.Key); _userInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage; + } + + protected override void Startup() + { + base.Startup(); foreach (var wiresProvider in Owner.GetAllComponents()) { diff --git a/RobustToolbox b/RobustToolbox index 6677035233..643c76b28e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 66770352331043a80f9d0d15c0e9c46a8d3e6b78 +Subproject commit 643c76b28ea9d0612a38326d08c277de013153b6