Merge pull request #1083 from MediaBrowser/dev

3.0.5582.3

1 files changed, 10 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 5791da1ea2..51f23984a8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1002,8 +1002,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 List<TimerInfo> timerList;
                 if (!timers.TryGetValue(program.ServiceName, out timerList))
                 {
-                    var tempTimers = await GetService(program.ServiceName).GetTimersAsync(cancellationToken).ConfigureAwait(false);
-                    timers[program.ServiceName] = timerList = tempTimers.ToList();
+                    try
+                    {
+                        var tempTimers = await GetService(program.ServiceName).GetTimersAsync(cancellationToken).ConfigureAwait(false);
+                        timers[program.ServiceName] = timerList = tempTimers.ToList();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error getting timer infos", ex);
+                        timers[program.ServiceName] = timerList = new List<TimerInfo>();
+                    }
                 }
 
                 var timer = timerList.FirstOrDefault(i => string.Equals(i.ProgramId, program.ExternalId, StringComparison.OrdinalIgnoreCase));