summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-06-20 18:06:50 +0000
committersr55 <[email protected]>2012-06-20 18:06:50 +0000
commit31abfae6433980b30df5a7f11530e4a2bb2eac9c (patch)
tree03934b5e6c41317246311ef88eb55f6a982c7efa /win/CS
parent0ae91859da21ed913404ac5a890196a6995f515b (diff)
WinGui: Replace the EncodeStart with QueueStart event to fix an issue where Preview window could interfere with the main window.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4762 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs23
1 files changed, 11 insertions, 12 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 25dad1d4f..a47b6c8c0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -185,10 +185,9 @@ namespace HandBrakeWPF.ViewModels
this.scanService.ScanStared += this.ScanStared;
this.scanService.ScanCompleted += this.ScanCompleted;
this.scanService.ScanStatusChanged += this.ScanStatusChanged;
-
+ this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
this.queueProcessor.QueueCompleted += this.QueueCompleted;
this.queueProcessor.QueuePaused += this.QueuePaused;
- this.queueProcessor.EncodeService.EncodeStarted += this.EncodeStarted;
this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeStatusChanged;
this.Presets = this.presetService.Presets;
@@ -810,7 +809,7 @@ namespace HandBrakeWPF.ViewModels
this.queueProcessor.QueueCompleted -= this.QueueCompleted;
this.queueProcessor.QueuePaused -= this.QueuePaused;
- this.queueProcessor.EncodeService.EncodeStarted -= this.EncodeStarted;
+ this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
}
@@ -1494,22 +1493,22 @@ namespace HandBrakeWPF.ViewModels
}
/// <summary>
- /// Encode Started Handler
+ /// Handle the Queue Starting Event
/// </summary>
/// <param name="sender">
- /// The Sender
+ /// The sender.
/// </param>
/// <param name="e">
- /// The EventArgs
+ /// The e.
/// </param>
- private void EncodeStarted(object sender, EventArgs e)
+ void QueueProcessorJobProcessingStarted(object sender, HandBrake.ApplicationServices.EventArgs.QueueProgressEventArgs e)
{
Execute.OnUIThread(
- () =>
- {
- this.StatusLabel = "Preparing to encode ...";
- this.IsEncoding = true;
- });
+ () =>
+ {
+ this.StatusLabel = "Preparing to encode ...";
+ this.IsEncoding = true;
+ });
// TODO Handle Updating the UI
}