From 78e4e2ed929155b433fc0cbb2ea6fc7f64411a72 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Sat, 2 Feb 2019 21:45:29 +0100
Subject: Fix all warnings

---
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  1 -
 .../LiveTv/LiveTvManager.cs                        | 27 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Emby.Server.Implementations/LiveTv')

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index bce9c240d..c5c0ac463 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -64,7 +64,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public static EmbyTV Current;
 
-        public event EventHandler DataSourceChanged;
         public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
         public event EventHandler<GenericEventArgs<string>> TimerCancelled;
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index c3437bcda..a36302876 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -53,7 +53,7 @@ namespace Emby.Server.Implementations.LiveTv
 
         private readonly LiveTvDtoService _tvDtoService;
 
-        private ILiveTvService[] _services = new ILiveTvService[] { };
+        private ILiveTvService[] _services = Array.Empty<ILiveTvService>();
 
         private ITunerHost[] _tunerHosts = Array.Empty<ITunerHost>();
         private IListingsProvider[] _listingProviders = Array.Empty<IListingsProvider>();
@@ -127,8 +127,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             foreach (var service in _services)
             {
-                service.DataSourceChanged += service_DataSourceChanged;
-
                 if (service is EmbyTV.EmbyTV embyTv)
                 {
                     embyTv.TimerCreated += EmbyTv_TimerCreated;
@@ -184,14 +182,6 @@ namespace Emby.Server.Implementations.LiveTv
             return EmbyTV.EmbyTV.Current.DiscoverTuners(newDevicesOnly, cancellationToken);
         }
 
-        void service_DataSourceChanged(object sender, EventArgs e)
-        {
-            if (!_isDisposed)
-            {
-                _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
-            }
-        }
-
         public QueryResult<BaseItem> GetInternalChannels(LiveTvChannelQuery query, DtoOptions dtoOptions, CancellationToken cancellationToken)
         {
             var user = query.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(query.UserId);
@@ -2153,17 +2143,28 @@ namespace Emby.Server.Implementations.LiveTv
             Dispose(true);
         }
 
-        private bool _isDisposed = false;
+        private bool _disposed = false;
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool dispose)
         {
+            if (_disposed)
+            {
+                return;
+            }
+
             if (dispose)
             {
-                _isDisposed = true;
+                // TODO: Dispose stuff
             }
+
+            _services = null;
+            _listingProviders = null;
+            _tunerHosts = null;
+
+            _disposed = true;
         }
 
         private LiveTvServiceInfo[] GetServiceInfos()
-- 
cgit v1.2.3