From: sr55 <sr55.hb@outlook.com> Date: Sat, 15 Dec 2018 20:35:34 +0000 (+0000) Subject: WinGui: Reset the cancel flag on the Countdown Window for post-encode actions. #1729 X-Git-Tag: 1.2.0~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e747a14f5c5bef72490a19c93914f9e71cd9b22;p=handbrake WinGui: Reset the cancel flag on the Countdown Window for post-encode actions. #1729 --- diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs index dd4621ba0..1856ca4f3 100644 --- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs +++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs @@ -157,7 +157,7 @@ namespace HandBrakeWPF.Services if (!titleSpecificView.IsCancelled) { - // Do something whent he encode ends. + // Do something when the encode ends. switch (this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction)) { case "Shutdown": diff --git a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs index 703f9a5af..ccee60870 100644 --- a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs @@ -117,9 +117,10 @@ namespace HandBrakeWPF.ViewModels /// </param> public void SetAction(string actionMsg) { + this.IsCancelled = false; this.Ticks = 0; timer.Start(); - this.action = actionMsg; + this.action = actionMsg; } #endregion