From: sr55 <sr55.hb@outlook.com>
Date: Thu, 12 Oct 2017 19:09:15 +0000 (+0100)
Subject: WinGui: Fix a culture issue with Framerates. Fixes #926
X-Git-Tag: 1.1.0~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6368739d77656be1532022a41e0c73ba445858be;p=handbrake

WinGui: Fix a culture issue with Framerates. Fixes #926
---

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 4acbc4c63..62ace3257 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -347,9 +347,20 @@ namespace HandBrakeWPF.Services.Presets.Factories
                     preset.Task.VideoTunes.Add(new VideoTune(item, item));
                 }
             }
-            preset.Task.Framerate = importedPreset.VideoFramerate == "auto" || importedPreset.VideoFramerate == "Same as source" || string.IsNullOrEmpty(importedPreset.VideoFramerate)
-                                 ? (double?)null
-                                 : double.Parse(importedPreset.VideoFramerate, CultureInfo.InvariantCulture);
+
+            if (importedPreset.VideoFramerate == "auto" || importedPreset.VideoFramerate == "Same as source" || string.IsNullOrEmpty(importedPreset.VideoFramerate))
+            {
+                preset.Task.Framerate = null;
+            }
+            else
+            {
+                double parsedFramerate;
+                if (double.TryParse(importedPreset.VideoFramerate, NumberStyles.Any, CultureInfo.CurrentCulture, out parsedFramerate) || double.TryParse(importedPreset.VideoFramerate, NumberStyles.Any, CultureInfo.InvariantCulture, out parsedFramerate))
+                {
+                    preset.Task.Framerate = parsedFramerate;
+                }              
+            }
+
             string parsedValue = importedPreset.VideoFramerateMode;
             switch (parsedValue)
             {