WinGui: Make the Audio Sample Rate tolerant of number styles. Fixes #1193

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index b10b9c19e3b7afed46c704c10643d2f453614794..8c173c4d0a60a6935fd9dec765b9226fb2d1d48e 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -449,7 +449,15 @@ namespace HandBrakeWPF.Services.Presets.Factories
                     track.MixDown = HandBrakeEncoderHelpers.GetMixdown(audioTrack.AudioMixdown);\r
 \r
                     // track.AudioNormalizeMixLevel = audioTrack.AudioNormalizeMixLevel;\r
-                    track.SampleRate = string.IsNullOrEmpty(audioTrack.AudioSamplerate) || audioTrack.AudioSamplerate.ToLower() == "auto" ? 0 : double.Parse(audioTrack.AudioSamplerate);\r
+\r
+                    if (!string.IsNullOrEmpty(audioTrack.AudioSamplerate) && !"auto".Equals(audioTrack.AudioSamplerate))\r
+                    {\r
+                        double sampleRate = 0;\r
+                        if (double.TryParse(audioTrack.AudioSamplerate, NumberStyles.Any, CultureInfo.InvariantCulture, out sampleRate))\r
+                        {\r
+                            track.SampleRate = sampleRate;\r
+                        }\r
+                    }\r
 \r
                     track.EncoderRateType = audioTrack.AudioTrackQualityEnable ? AudioEncoderRateType.Quality : AudioEncoderRateType.Bitrate;\r
                     track.Quality = audioTrack.AudioTrackQuality;\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index cd4c74e35df9d918238179911de1cd8c8adb8096..a7d4dbefa27b184ff81217a2650166c7ae24f318 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -589,9 +589,8 @@ namespace HandBrakeWPF.Services.Presets
                     {\r
                         continue;\r
                     }\r
-                   \r
-                        categoriesList.Add(category);\r
-                   \r
+\r
+                    categoriesList.Add(category);\r
                 }\r
             }\r
 \r