From: sr55 <sr55.hb@outlook.com>
Date: Wed, 5 Jul 2017 18:35:28 +0000 (+0100)
Subject: WinGui: Make the Preset Import system a bit more robust. #808
X-Git-Tag: 1.1.0~473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c8c97e97a373602b238dff792e508e1a1a2bcde;p=handbrake

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 1df789cb2..118b5cbf7 100644
--- 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>
         /// Gets or sets the video avg bitrate.
         /// </summary>
-        public int VideoAvgBitrate { get; set; }
+        public int? VideoAvgBitrate { get; set; }
 
         /// <summary>
         /// Gets or sets the video color matrix code.
diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index b581becb2..14001040e 100644
--- 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)
                     {
                         PresetCategory category = JsonConvert.DeserializeObject<PresetCategory>(objectPreset.ToString());
-                        if (category != null && category.ChildrenArray.Count > 0)
+                        if (category != null && category.ChildrenArray != null && category.ChildrenArray.Count > 0)
                         {
                             foreach (HBPreset hbPreset in category.ChildrenArray)
                             {