WinGui: Fix crash on Audio Defaults View. Fixes #2341

diff --git a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
index be7c1827bbcf0a61213c2fda513af7576b9c8b93..ca32b7af43e97369c3e7830d2ed0e9dfc60307a1 100644 (file)
--- a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
@@ -82,7 +82,6 @@ namespace HandBrakeWPF.Utilities
 
                         foreach (PropertyData pc in share.Properties)
                         {
-                            Console.WriteLine(pc.Name + ": " + pc.Value);
                             if (!string.IsNullOrEmpty(pc.Name) && pc.Value != null)
                             {
                                 if (pc.Name.Equals("DriverVersion")) version = pc.Value.ToString();

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index b901e805e68324c505b59610fb6c1bb60b4b74b7..ab49f09c23995d0ad702cbeff5e50ba92413d2d1 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -307,10 +307,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void EditAudioDefaults()\r
         {\r
-            AudioDefaultsView view = new AudioDefaultsView();\r
-            view.DataContext = this.audioDefaultsViewModel;\r
-\r
-            if (view.ShowDialog() == true)\r
+            if (this.windowManager.ShowDialog(this.audioDefaultsViewModel) == true)\r
             {\r
                 this.Preset.AudioTrackBehaviours = this.audioDefaultsViewModel.AudioBehaviours.Clone();\r
             }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index d33cf5ea37213143524c57aa2869a6135c7f4fc9..39a1a224af482b43b939118d48e428556adbdf9a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -226,10 +226,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void ShowAudioDefaults()\r
         {\r
-            AudioDefaultsView view = new AudioDefaultsView();\r
-            view.DataContext = this.AudioDefaultsViewModel;\r
-\r
-            if (view.ShowDialog() == true)\r
+            if (this.windowManager.ShowDialog(this.AudioDefaultsViewModel) == true)\r
             {\r
                 this.OnTabStatusChanged(null);\r
             }\r