From 6fa4b2bbdae649f62a8fc6a1fe6aba058971667c Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Thu, 11 Feb 2016 19:47:20 +0100 Subject: [PATCH] Fix missing 'Cancel' buttons on some confirmation prompts --- OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs | 6 ++++-- OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs index 2a8b44e900..ef4fe121d6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs @@ -317,7 +317,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after(newUid); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); } void DeleteAllMaps(string[] maps, Action after) @@ -331,7 +332,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after(WidgetUtils.ChooseInitialMap(null)); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); } } } diff --git a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs index 8b7a420f8a..5c0032e2aa 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs @@ -410,7 +410,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (after != null) after.Invoke(); }, - confirmText: "Delete"); + confirmText: "Delete", + onCancel: () => { }); }; { @@ -450,7 +451,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (selectedReplay == null) SelectFirstVisibleReplay(); }, - confirmText: "Delete All"); + confirmText: "Delete All", + onCancel: () => { }); }; } }