From ef35ee22046b54cf726288d2737f979ac4ae8d22 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Thu, 25 Sep 2014 21:02:39 +0200 Subject: [PATCH] Load end-game dialog only after game ends, not already when it starts This is to ensure that statistics reflect the state at the end of the game, not that from the start of the game. Fixes #6547. --- OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs | 6 +----- .../Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs index 8b44ae3bb3..26e5579724 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs @@ -45,14 +45,10 @@ namespace OpenRA.Mods.D2k.Widgets.Logic { Game.LoadWidget(world, "CHAT_PANEL", gameRoot, new WidgetArgs()); - var showleaveMapWidget = false; - var leaveMapWidget = Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); - leaveMapWidget.IsVisible = () => showleaveMapWidget; - Action ShowLeaveMapWidget = () => { gameRoot.RemoveChildren(); - showleaveMapWidget = true; + Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); }; world.GameOver += ShowLeaveMapWidget; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs index d7a1fac464..a981fed98c 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs @@ -43,14 +43,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.LoadWidget(world, "CHAT_PANEL", ingameRoot, new WidgetArgs()); - var showLeaveMapWidget = false; - var leaveMapWidget = Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); - leaveMapWidget.IsVisible = () => showLeaveMapWidget; - Action ShowLeaveMapWidget = () => { ingameRoot.RemoveChildren(); - showLeaveMapWidget = true; + Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); }; world.GameOver += ShowLeaveMapWidget; }