From a05d803d4c188e3bc6ae22e5be907f74eec271bf Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Sun, 27 Jan 2019 20:18:51 +0100 Subject: [PATCH] Fix crash when trying to deserialize a non-existing scheduled task --- .../ScheduledTasks/ScheduledTaskWorker.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index 88b3dd07f0..5fa24e6470 100644 --- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs +++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs @@ -528,14 +528,13 @@ namespace Emby.Server.Implementations.ScheduledTasks private TaskTriggerInfo[] LoadTriggerSettings() { string path = GetConfigurationFilePath(); - if (!File.Exists(path)) + TaskTriggerInfo[] list = null; + if (File.Exists(path)) { - // File doesn't exist. No biggie. Return defaults. - GetDefaultTriggers(); + list = JsonSerializer.DeserializeFromFile(path); } - var list = JsonSerializer.DeserializeFromFile(path); - + // Return defaults if file doesn't exist. return list ?? GetDefaultTriggers(); }