summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Services
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-08-18 20:29:53 +0000
committersr55 <[email protected]>2013-08-18 20:29:53 +0000
commitf7dd1b81feb1a34e030d47f782bfa017a5550fd1 (patch)
tree8a7a643fe3f43ad117eed3ccc0ece471f3ed7dc2 /win/CS/HandBrakeWPF/Services
parent1b762c5dcdab7133e2954fd3bb21e239a74de7e5 (diff)
WinGui: Stopping an encode or pausing the queue will no longer run the "When Done" option.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5714 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
-rw-r--r--win/CS/HandBrakeWPF/Services/PrePostActionService.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
index afc125e99..964e453ad 100644
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.Services
using Caliburn.Micro;
+ using HandBrake.ApplicationServices.EventArgs;
using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrake.ApplicationServices.Utilities;
@@ -108,8 +109,13 @@ namespace HandBrakeWPF.Services
/// <param name="e">
/// The e.
/// </param>
- private void QueueProcessorQueueCompleted(object sender, System.EventArgs e)
+ private void QueueProcessorQueueCompleted(object sender, QueueCompletedEventArgs e)
{
+ if (e.WasManuallyStopped)
+ {
+ return;
+ }
+
// Do something whent he encode ends.
switch (this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction))
{