Merging latest LYN-8025_PipeEditorServerLogsToEditor

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-30 12:08:19 -08:00
parent d786e9d8e2 8afd47950c
commit 78d0a8e54a
5 changed files with 39 additions and 5 deletions
@@ -6,7 +6,6 @@
 *
 */

-
 #include <Multiplayer/IMultiplayer.h>
 #include <Multiplayer/IMultiplayerTools.h>
 #include <Multiplayer/INetworkSpawnableLibrary.h>
@@ -421,7 +420,17 @@ namespace Multiplayer

    void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint)
    {
-        m_serverProcessTracePrinter->Pump();
+        if (m_serverProcessTracePrinter)
+        {
+            m_serverProcessTracePrinter->Pump();
+        }
+        else
+        {
+            AZ::TickBus::Handler::BusDisconnect();
+            AZ_Warning(
+                "MultiplayerEditorSystemComponent", false,
+                "The server process trace printer is NULL so we won't be able to pipe server logs to the editor. Please update the code to call AZ::TickBus::Handler::BusDisconnect whenever the editor-server is terminated.")
+        }
    }

 }