WinGui: Tidy up some warnings that you get when you import WinGui pre…

…sets into the CLI. HandBrake#906
gcracker · Sep 20, 2017 · 262097f · 262097f
1 parent b37f8bd
commit 262097f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
@@ -91,7 +91,7 @@ public static PresetTransportContainer GetPresetFromFile(string filename)
         /// </param>
         public static void ExportPreset(string filename, PresetTransportContainer container)
         {
-            string preset = JsonConvert.SerializeObject(container, Formatting.Indented);
+            string preset = JsonConvert.SerializeObject(container, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             using (StreamWriter writer = new StreamWriter(filename))
             {
                 writer.Write(preset);

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -657,7 +657,7 @@ public static HBPreset CreateHbPreset(Preset export, HBConfiguration config)
 
             // Video
             preset.VideoEncoder = EnumHelper<VideoEncoder>.GetShortName(export.Task.VideoEncoder);
-            preset.VideoFramerate = export.Task.Framerate.ToString();
+            preset.VideoFramerate = export.Task.Framerate.HasValue ? export.Task.Framerate.ToString() : null;
             preset.VideoFramerateMode = EnumHelper<FramerateMode>.GetShortName(export.Task.FramerateMode);
             preset.VideoGrayScale = export.Task.Grayscale;
             preset.VideoLevel = export.Task.VideoLevel != null ? export.Task.VideoLevel.ShortName : null;