From 3e29ef0bd65c5d3f37eb34d1cc72af2fcada1a26 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Wed, 4 Jul 2018 22:19:14 +0200 Subject: [PATCH] Avoid sending HTTP requests to the FetchNews URL when FetchNews is disabled Also disables the 'Send SysInfo' settings checkbox when 'Fetch News' is disabled as well. --- OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs index 586f631b38..80ad382c3a 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs @@ -287,7 +287,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic void LoadAndDisplayNews(string newsURL, Widget newsBG) { - if (newsBG != null) + if (newsBG != null && Game.Settings.Game.FetchNews) { var cacheFile = Platform.ResolvePath(Platform.SupportDirPrefix, "news.yaml"); var currentNews = ParseNews(cacheFile); diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs index 1ab3b55a76..69880da0c0 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs @@ -492,6 +492,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic BindCheckboxPref(panel, "CHECK_VERSION_CHECKBOX", ds, "CheckVersion"); BindCheckboxPref(panel, "REPLAY_COMMANDS_CHECKBOX", ds, "EnableDebugCommandsInReplays"); + var ssi = panel.Get("SENDSYSINFO_CHECKBOX"); + ssi.IsDisabled = () => !gs.FetchNews; + return () => { }; }