WinGui: Fix Lock System action and hide the quit handbrake option from when done actions. Quit will return after the release. Won't fix now due to required re factoring work to fix it.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
index a442dc5ce..033042495 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
@@ -514,7 +514,7 @@ namespace HandBrake.ApplicationServices.Services
                     Win32.LockWorkStation();

                     break;

                 case "Quit HandBrake":

-                    Application.Exit();

+                    Execute.OnUIThread(() => { Application.Current.Shutdown(); });

                     break;

             }

         }

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 8156aa806..361094689 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1480,9 +1480,9 @@ namespace HandBrakeWPF.ViewModels
             this.whenDoneOptions.Add("Shutdown");

             this.whenDoneOptions.Add("Suspend");

             this.whenDoneOptions.Add("Hibernate");

-            this.whenDoneOptions.Add("Lock system");

+            this.whenDoneOptions.Add("Lock System");

             this.whenDoneOptions.Add("Log off");

-            this.whenDoneOptions.Add("Quit HandBrake");

+           // this.whenDoneOptions.Add("Quit HandBrake");

             this.WhenDone = userSettingService.GetUserSetting<string>("WhenCompleteAction");

 

             this.GrowlAfterEncode = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode);