aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaus Vium <clausvium@gmail.com>2019-01-27 20:18:51 +0100
committerBond-009 <bond.009@outlook.com>2019-01-27 21:09:40 +0100
commita05d803d4c188e3bc6ae22e5be907f74eec271bf (patch)
treec687ebbb8899209412b5074c79fd3919c2013c0f
parentb4893b9ac90ea19eb65888d87e73ca260067a999 (diff)
Fix crash when trying to deserialize a non-existing scheduled task
-rw-r--r--Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 88b3dd07f..5fa24e647 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<TaskTriggerInfo[]>(path);
}
- var list = JsonSerializer.DeserializeFromFile<TaskTriggerInfo[]>(path);
-
+ // Return defaults if file doesn't exist.
return list ?? GetDefaultTriggers();
}