From 9961051fdf7a2f86771baeeebdd7983833eb7dc4 Mon Sep 17 00:00:00 2001 From: Dominion Date: Mon, 22 May 2023 23:50:11 -0400 Subject: [PATCH] Fix update message callbacks potentially not being registered before activation --- .../Components/Chat/ChatManager.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs index 400d55e9b7..8124434888 100644 --- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs +++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs @@ -413,12 +413,17 @@ namespace Tgstation.Server.Host.Components.Chat AddMessageTask(task); - return (errorMessage, dreamMakerOutput) => AddMessageTask( - Task.WhenAll( + async Task CollateTasks(string errorMessage, string dreamMakerOutput) + { + await task; + await Task.WhenAll( callbacks.Select( x => x( errorMessage, - dreamMakerOutput)))); + dreamMakerOutput))); + } + + return (errorMessage, dreamMakerOutput) => AddMessageTask(CollateTasks(errorMessage, dreamMakerOutput)); } ///