WinGui: When opening preferences, reset to General tab if the last tab used was the...

diff --git a/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs b/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
index 5bfbb22d7b00e5ca4f7a83dd1843af71ef872018..238e6655ff192b54c58d16261a1669f45a2f1412 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
@@ -50,11 +50,17 @@ namespace HandBrakeWPF.Commands
         public void Execute(object parameter)\r
         {\r
             var shellViewModel = IoC.Get<IShellViewModel>();\r
+            var optionsViewModel = IoC.Get<IOptionsViewModel>();\r
+\r
             shellViewModel.DisplayWindow(ShellWindow.OptionsWindow);\r
 \r
+            if (parameter == null && optionsViewModel.SelectedTab == OptionsTab.About)\r
+            {\r
+                optionsViewModel.GotoTab(OptionsTab.General);\r
+            }\r
+\r
             if (parameter != null && parameter.GetType() == typeof(OptionsTab))\r
             {\r
-                var optionsViewModel = IoC.Get<IOptionsViewModel>();\r
                 optionsViewModel.GotoTab((OptionsTab)parameter);\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
index e37f1da078b24035546a75ee8e8d793a09f905a7..827d0a0fbad17726cd94e8b7df4c71cd804cef97 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
@@ -16,6 +16,11 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     /// </summary>\r
     public interface IOptionsViewModel\r
     {\r
+        /// <summary>\r
+        /// The currently selected Tab in the options pane.\r
+        /// </summary>\r
+        OptionsTab SelectedTab { get; }\r
+\r
         /// <summary>\r
         /// The goto tab.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 47a34e4e810c11b8686ae8fcfa577f57311287ff..a41fb01dcd0c32b8ab38be13c9e7049a1ae5b6f0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1368,8 +1368,8 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void OpenOptionsWindow()\r
         {\r
-            IShellViewModel shellViewModel = IoC.Get<IShellViewModel>();\r
-            shellViewModel.DisplayWindow(ShellWindow.OptionsWindow);\r
+            OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();\r
+            command.Execute(null);\r
         }\r
 \r
         /// <summary>\r