diff options
| author | sr55 <[email protected]> | 2018-09-22 21:52:00 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2018-09-22 21:52:00 +0100 |
| commit | 08da5b7e209cd511909b9182e6bfe34c5015e4a6 (patch) | |
| tree | 99f6adadf84d3f75777de399177e422b51a40c7a /win | |
| parent | e8f7443a6f31f657f0b51721bb4ff12cea9b5d5a (diff) | |
WinGui: Couple of queue bug fixes. #1087
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 10 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index a11b14571..c393176fd 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -547,18 +547,12 @@ namespace HandBrakeWPF.ViewModels public void Activate()
{
- this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;
- this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;
- this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
- this.queueProcessor.QueuePaused += this.QueueProcessor_QueuePaused;
+ this.OnActivate();
}
public void Deactivate()
{
- this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;
- this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;
- this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
- this.queueProcessor.QueuePaused -= this.QueueProcessor_QueuePaused;
+ this.OnDeactivate(false);
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml index 1a8828be5..61acb9962 100644 --- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml +++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml @@ -273,7 +273,7 @@ </StackPanel.Resources> - <Button Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}" > + <Button> <Button.Content> <StackPanel Orientation="Horizontal"> <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" |