diff options
Diffstat (limited to 'MediaBrowser.Dlna')
| -rw-r--r-- | MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/Device.cs | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs index 5d9bd0c7d..879f3045f 100644 --- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs +++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs @@ -1,5 +1,4 @@ -using System.Linq; -using MediaBrowser.Common.Extensions; +using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; @@ -16,6 +15,7 @@ using MediaBrowser.Model.Querying; using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs index f67094554..c43efcd1d 100644 --- a/MediaBrowser.Dlna/PlayTo/Device.cs +++ b/MediaBrowser.Dlna/PlayTo/Device.cs @@ -124,7 +124,6 @@ namespace MediaBrowser.Dlna.PlayTo { _logger.Debug("RestartTimer"); _timer.Change(10, GetPlaybackTimerIntervalMs()); - _volumeTimer.Change(100, GetVolumeTimerIntervalMs()); } @@ -147,8 +146,14 @@ namespace MediaBrowser.Dlna.PlayTo _logger.Debug("RestartTimerInactive"); var interval = GetInactiveTimerIntervalMs(); - _timer.Change(interval, interval); - _volumeTimer.Change(Timeout.Infinite, Timeout.Infinite); + if (_timer != null) + { + _timer.Change(interval, interval); + } + if (_volumeTimer != null) + { + _volumeTimer.Change(Timeout.Infinite, Timeout.Infinite); + } } _timerActive = false; |