WinGui: Make the Preset Import system a bit more robust. #808

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
index 1df789cb22884c68b7e680f68fadb2de9786e865..118b5cbf75b2add1a1fc0404973c127fcbd64bbd 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
@@ -311,7 +311,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>\r
         /// Gets or sets the video avg bitrate.\r
         /// </summary>\r
-        public int VideoAvgBitrate { get; set; }\r
+        public int? VideoAvgBitrate { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the video color matrix code.\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index b581becb2df99aae668b34783eac63e6b5a2826a..14001040e9ca4cd6f63ee4acbb2c67b28dde6a71 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -198,7 +198,7 @@ namespace HandBrakeWPF.Services.Presets
                     foreach (var objectPreset in container.PresetList)\r
                     {\r
                         PresetCategory category = JsonConvert.DeserializeObject<PresetCategory>(objectPreset.ToString());\r
-                        if (category != null && category.ChildrenArray.Count > 0)\r
+                        if (category != null && category.ChildrenArray != null && category.ChildrenArray.Count > 0)\r
                         {\r
                             foreach (HBPreset hbPreset in category.ChildrenArray)\r
                             {\r