Merge pull request #955 from ploughpuff/avoid

Avoid exceptions due to folder and file not found

1 files changed, 6 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index b825ea3b0..a2ac60b31 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -43,12 +43,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             var jsonFile = path + ".json";
 
-            try
+            if (!File.Exists(jsonFile))
             {
-                return _jsonSerializer.DeserializeFromFile<List<T>>(jsonFile) ?? new List<T>();
+                return new List<T>();
             }
-            catch (FileNotFoundException)
+
+            try
             {
+                return _jsonSerializer.DeserializeFromFile<List<T>>(jsonFile) ?? new List<T>();
             }
             catch (IOException)
             {
@@ -57,6 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 Logger.LogError(ex, "Error deserializing {jsonFile}", jsonFile);
             }
+
             return new List<T>();
         }