WinGui: Misc UI fixes and fixes to the logging code for scanning that could sometimes cause a crash.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7094 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 12 insertions, 0 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 71d8c6a73..7465ceb10 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -53,6 +53,7 @@ namespace HandBrakeWPF.ViewModels
 

     using Ookii.Dialogs.Wpf;

 

+    using Action = System.Action;

     using Execute = Caliburn.Micro.Execute;

     using IQueueProcessor = HandBrakeWPF.Services.Queue.Interfaces.IQueueProcessor;

 

@@ -1046,6 +1047,17 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }

 

+        /// <summary>

+        /// Gets the cancel action.

+        /// </summary>

+        public Action CancelAction

+        {

+            get

+            {

+                return this.CancelScan;

+            }

+        }

+

         #endregion

 

         #region Load and Shutdown Handling