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 dd4621ba02c0014184e13c92ca7a5c5280335e02..1856ca4f38f95021a8ed87e3235f85fc80977440 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -157,7 +157,7 @@ namespace HandBrakeWPF.Services
 \r
             if (!titleSpecificView.IsCancelled)\r
             {\r
-                // Do something whent he encode ends.\r
+                // Do something when the encode ends.\r
                 switch (this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction))\r
                 {\r
                     case "Shutdown":\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
index 703f9a5af9edaeec063048ee764334adfd7bd73f..ccee60870d12c2eba7fb757fcf9f7a89bb935327 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
@@ -117,9 +117,10 @@ namespace HandBrakeWPF.ViewModels
         /// </param>\r
         public void SetAction(string actionMsg)\r
         {\r
+            this.IsCancelled = false;\r
             this.Ticks = 0;\r
             timer.Start();\r
-            this.action = actionMsg;\r
+            this.action = actionMsg;    \r
         }\r
 \r
         #endregion\r