diff options
| author | sr55 <[email protected]> | 2018-12-15 20:35:34 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2018-12-15 20:35:47 +0000 |
| commit | 6e747a14f5c5bef72490a19c93914f9e71cd9b22 (patch) | |
| tree | cd6d2a493142d79f2799c13371018b058e718aa2 /win/CS | |
| parent | 0da83e3c9256fc718e0f52d46d96b14136e8f63e (diff) | |
WinGui: Reset the cancel flag on the Countdown Window for post-encode actions. #1729
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/PrePostActionService.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs | 3 |
2 files changed, 3 insertions, 2 deletions
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
|