From 0dae638ca02ecc5eeb80c80e70f4406fe9e6c5f1 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 21 May 2019 08:24:39 -0700 Subject: [PATCH] Handle empty cache file case - Issue MatterHackers/MCCentral#5530 Error loading cached OemProfiles data crashes MatterControl --- MatterControlLib/SettingsManagement/OemSettings.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/SettingsManagement/OemSettings.cs b/MatterControlLib/SettingsManagement/OemSettings.cs index 65b5b8eff..b7acaa895 100644 --- a/MatterControlLib/SettingsManagement/OemSettings.cs +++ b/MatterControlLib/SettingsManagement/OemSettings.cs @@ -177,7 +177,12 @@ namespace MatterHackers.MatterControl.SettingsManagement string cachePath = ApplicationController.CacheablePath("public-profiles", "oemprofiles.json"); // Load data from cache or fall back to stale StaticData content - string json = File.Exists(cachePath) ? File.ReadAllText(cachePath) : AggContext.StaticData.ReadAllText(Path.Combine("Profiles", "oemprofiles.json")); + string json = File.Exists(cachePath) ? File.ReadAllText(cachePath) : null; + + if (string.IsNullOrWhiteSpace(json)) + { + json = AggContext.StaticData.ReadAllText(Path.Combine("Profiles", "oemprofiles.json")); + } return JsonConvert.DeserializeObject(json); }