WinGui: Tidy up some warnings that you get when you import WinGui presets into the...

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
index adc9bcbd633e5fcb0d0985687e784bffc7f48e76..ae3387006bcd152a232c5c7c82ac99a6b375baf1 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
@@ -91,7 +91,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// </param>\r
         public static void ExportPreset(string filename, PresetTransportContainer container)\r
         {\r
-            string preset = JsonConvert.SerializeObject(container, Formatting.Indented);\r
+            string preset = JsonConvert.SerializeObject(container, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });\r
             using (StreamWriter writer = new StreamWriter(filename))\r
             {\r
                 writer.Write(preset);\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index b3d138efd0f3c70fd06c6470306c1ce7f9c08da2..4acbc4c63d43fde29e4a8ac964987712734f78e0 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -657,7 +657,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
 \r
             // Video\r
             preset.VideoEncoder = EnumHelper<VideoEncoder>.GetShortName(export.Task.VideoEncoder);\r
-            preset.VideoFramerate = export.Task.Framerate.ToString();\r
+            preset.VideoFramerate = export.Task.Framerate.HasValue ? export.Task.Framerate.ToString() : null;\r
             preset.VideoFramerateMode = EnumHelper<FramerateMode>.GetShortName(export.Task.FramerateMode);\r
             preset.VideoGrayScale = export.Task.Grayscale;\r
             preset.VideoLevel = export.Task.VideoLevel != null ? export.Task.VideoLevel.ShortName : null;\r