From afb420810ee7f501d80ee0e57b282cbced2327e7 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 18 Jul 2018 11:41:39 +0300 Subject: [PATCH] Fixed dedicated server stopping GameAnalytics and never restarting it when the "restart" console command is used. + Fixed typo in GameAnalyticsManager. Closes #492 --- Barotrauma/BarotraumaServer/Source/GameMain.cs | 2 -- Barotrauma/BarotraumaServer/Source/Program.cs | 1 + Barotrauma/BarotraumaShared/Source/GameAnalyticsManager.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Barotrauma/BarotraumaServer/Source/GameMain.cs b/Barotrauma/BarotraumaServer/Source/GameMain.cs index 699dc4b63..15f52d864 100644 --- a/Barotrauma/BarotraumaServer/Source/GameMain.cs +++ b/Barotrauma/BarotraumaServer/Source/GameMain.cs @@ -124,7 +124,6 @@ namespace Barotrauma public void CloseServer() { - if (GameSettings.SendUserStatistics) GameAnalytics.OnStop(); Server.Disconnect(); Server = null; } @@ -171,7 +170,6 @@ namespace Barotrauma stopwatch.Stop(); CloseServer(); - } public void ProcessInput() diff --git a/Barotrauma/BarotraumaServer/Source/Program.cs b/Barotrauma/BarotraumaServer/Source/Program.cs index 8d0c41ba1..4e6ea36bc 100644 --- a/Barotrauma/BarotraumaServer/Source/Program.cs +++ b/Barotrauma/BarotraumaServer/Source/Program.cs @@ -31,6 +31,7 @@ namespace Barotrauma inputThread.Start(); game.Run(); inputThread.Abort(); inputThread.Join(); + if (GameSettings.SendUserStatistics) GameAnalytics.OnStop(); } catch (Exception e) { diff --git a/Barotrauma/BarotraumaShared/Source/GameAnalyticsManager.cs b/Barotrauma/BarotraumaShared/Source/GameAnalyticsManager.cs index fa24b69e9..c9983f7a5 100644 --- a/Barotrauma/BarotraumaShared/Source/GameAnalyticsManager.cs +++ b/Barotrauma/BarotraumaShared/Source/GameAnalyticsManager.cs @@ -7,7 +7,7 @@ namespace Barotrauma { public static void Init() { -#if DEBUB +#if DEBUG GameAnalytics.SetEnabledInfoLog(true); #endif GameAnalytics.ConfigureBuild(GameMain.Version.ToString());