From 0199b4e2123ee56e5de3bd867fbd6907ccf940d4 Mon Sep 17 00:00:00 2001 From: stefansjfw <57057282+stefansjfw@users.noreply.github.com> Date: Tue, 3 Mar 2020 22:31:22 +0100 Subject: [PATCH] Handle exception while editor is parsing custom layouts (#1430) * Fix migrating never applied custom zonesets * Handle json parsing exception in LoadCustomModels() --- .../editor/FancyZonesEditor/Models/LayoutModel.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs index e8b22bf185..72c23a780f 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs @@ -154,7 +154,16 @@ namespace FancyZonesEditor.Models _customModels = new ObservableCollection(); FileStream inputStream = File.Open(Settings.CustomZoneSetsTmpFile, FileMode.Open); - var jsonObject = JsonDocument.Parse(inputStream, options: default); + JsonDocument jsonObject; + try + { + jsonObject = JsonDocument.Parse(inputStream, options: default); + } + catch + { + return _customModels; + } + JsonElement.ArrayEnumerator customZoneSetsEnumerator = jsonObject.RootElement.GetProperty("custom-zone-sets").EnumerateArray(); while (customZoneSetsEnumerator.MoveNext()) {