WinGui: Fix Lock System action and hide the quit handbrake option from when done...

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

diff --git a/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
index a442dc5ce4c2a6c9dc29d4b1181b27723bcc9518..033042495e7fbd4fa4e2442a173d565e8a91b2f7 100644 (file)
--- 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();\r
                     break;\r
                 case "Quit HandBrake":\r
-                    Application.Exit();\r
+                    Execute.OnUIThread(() => { Application.Current.Shutdown(); });\r
                     break;\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 8156aa806b8af78bb278d64fab55e640798d7dc8..3610946891aaa379e01c6a852a52f27741516a45 100644 (file)
--- 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");\r
             this.whenDoneOptions.Add("Suspend");\r
             this.whenDoneOptions.Add("Hibernate");\r
-            this.whenDoneOptions.Add("Lock system");\r
+            this.whenDoneOptions.Add("Lock System");\r
             this.whenDoneOptions.Add("Log off");\r
-            this.whenDoneOptions.Add("Quit HandBrake");\r
+           // this.whenDoneOptions.Add("Quit HandBrake");\r
             this.WhenDone = userSettingService.GetUserSetting<string>("WhenCompleteAction");\r
 \r
             this.GrowlAfterEncode = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode);\r