WinGui: Couple of queue bug fixes. #1087

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index a11b14571af2e4f4395e67060d32c2b49b876f2c..c393176fda1b06200216141faf52ee8d259cd4f0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -547,18 +547,12 @@ namespace HandBrakeWPF.ViewModels
 \r
         public void Activate()\r
         {\r
-            this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;\r
-            this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;\r
-            this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;\r
-            this.queueProcessor.QueuePaused += this.QueueProcessor_QueuePaused;\r
+           this.OnActivate();\r
         }\r
 \r
         public void Deactivate()\r
         {\r
-            this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;\r
-            this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;\r
-            this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;\r
-            this.queueProcessor.QueuePaused -= this.QueueProcessor_QueuePaused;\r
+           this.OnDeactivate(false);\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
index 1a8828be5d4e956324b964fac66290ef6fc0adb2..61acb9962ae03df1fa7dfc27b5aafb55991fa598 100644 (file)
--- 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"