diff --git a/Wabbajack.Common/StatusFeed/IUserIntervention.cs b/Wabbajack.Common/StatusFeed/IUserIntervention.cs index d3c253f6..6285fc70 100644 --- a/Wabbajack.Common/StatusFeed/IUserIntervention.cs +++ b/Wabbajack.Common/StatusFeed/IUserIntervention.cs @@ -6,24 +6,6 @@ using System.Threading.Tasks; namespace Wabbajack.Common.StatusFeed { - /// - /// Defines a message that requires user interaction. The user must perform some action - /// or make a choice. - /// - public interface IUserIntervention : IStatusMessage - { - /// - /// The user didn't make a choice, so this action should be aborted - /// - void Cancel(); - - /// - /// The user has provided the required information. - /// - /// - void Resume(T result); - } - /// /// Defines a message that requires user interaction. The user must perform some action /// or make a choice. @@ -34,10 +16,5 @@ namespace Wabbajack.Common.StatusFeed /// The user didn't make a choice, so this action should be aborted /// void Cancel(); - - /// - /// Resume without any further information - /// - void Resume(); } } diff --git a/Wabbajack.Lib/StatusMessages/ConfirmUpdateOfExistingInstall.cs b/Wabbajack.Lib/StatusMessages/ConfirmUpdateOfExistingInstall.cs index 4cc00a82..97b51326 100644 --- a/Wabbajack.Lib/StatusMessages/ConfirmUpdateOfExistingInstall.cs +++ b/Wabbajack.Lib/StatusMessages/ConfirmUpdateOfExistingInstall.cs @@ -35,7 +35,7 @@ will be reverted. Are you sure you wish to continue?"; _source.SetResult(Choice.Abort); } - public void Resume() + public void Confirm() { _source.SetResult(Choice.Continue); } diff --git a/Wabbajack/View Models/MainWindowVM.cs b/Wabbajack/View Models/MainWindowVM.cs index c1f1af14..89b4be81 100644 --- a/Wabbajack/View Models/MainWindowVM.cs +++ b/Wabbajack/View Models/MainWindowVM.cs @@ -75,7 +75,7 @@ namespace Wabbajack { var result = MessageBox.Show(msg.ExtendedDescription, msg.ShortDescription, MessageBoxButton.OKCancel); if (result == MessageBoxResult.OK) - msg.Resume(); + msg.Confirm(); else msg.Cancel(); }