]> granicus.if.org Git - handbrake/commitdiff
WinGui: Fix a culture issue with Framerates. Fixes #926
authorsr55 <sr55.hb@outlook.com>
Thu, 12 Oct 2017 19:09:15 +0000 (20:09 +0100)
committersr55 <sr55.hb@outlook.com>
Thu, 12 Oct 2017 19:09:15 +0000 (20:09 +0100)
win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs

index 4acbc4c63d43fde29e4a8ac964987712734f78e0..62ace3257f26fd0d9daa63ec53133a877325eed7 100644 (file)
@@ -347,9 +347,20 @@ namespace HandBrakeWPF.Services.Presets.Factories
                     preset.Task.VideoTunes.Add(new VideoTune(item, item));\r
                 }\r
             }\r
-            preset.Task.Framerate = importedPreset.VideoFramerate == "auto" || importedPreset.VideoFramerate == "Same as source" || string.IsNullOrEmpty(importedPreset.VideoFramerate)\r
-                                 ? (double?)null\r
-                                 : double.Parse(importedPreset.VideoFramerate, CultureInfo.InvariantCulture);\r
+\r
+            if (importedPreset.VideoFramerate == "auto" || importedPreset.VideoFramerate == "Same as source" || string.IsNullOrEmpty(importedPreset.VideoFramerate))\r
+            {\r
+                preset.Task.Framerate = null;\r
+            }\r
+            else\r
+            {\r
+                double parsedFramerate;\r
+                if (double.TryParse(importedPreset.VideoFramerate, NumberStyles.Any, CultureInfo.CurrentCulture, out parsedFramerate) || double.TryParse(importedPreset.VideoFramerate, NumberStyles.Any, CultureInfo.InvariantCulture, out parsedFramerate))\r
+                {\r
+                    preset.Task.Framerate = parsedFramerate;\r
+                }              \r
+            }\r
+\r
             string parsedValue = importedPreset.VideoFramerateMode;\r
             switch (parsedValue)\r
             {\r