From d623f616fa01abf5c0d0625eaf5c17c4acf86803 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Mon, 25 Mar 2019 17:32:27 +0100
Subject: [PATCH] Improved dispose method

---
 Emby.Dlna/PlayTo/PlayToController.cs | 40 ++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 0808c77d11..c58f16438b 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -607,22 +607,34 @@ namespace Emby.Dlna.PlayTo
 
         public void Dispose()
         {
-            if (!_disposed)
-            {
-                _disposed = true;
-
-                _device.PlaybackStart -= _device_PlaybackStart;
-                _device.PlaybackProgress -= _device_PlaybackProgress;
-                _device.PlaybackStopped -= _device_PlaybackStopped;
-                _device.MediaChanged -= _device_MediaChanged;
-                //_deviceDiscovery.DeviceLeft -= _deviceDiscovery_DeviceLeft;
-                _device.OnDeviceUnavailable = null;
-
-                _device.Dispose();
-            }
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                _device.Dispose();
+            }
+
+            _device.PlaybackStart -= _device_PlaybackStart;
+            _device.PlaybackProgress -= _device_PlaybackProgress;
+            _device.PlaybackStopped -= _device_PlaybackStopped;
+            _device.MediaChanged -= _device_MediaChanged;
+            _deviceDiscovery.DeviceLeft -= _deviceDiscovery_DeviceLeft;
+            _device.OnDeviceUnavailable = null;
+            _device = null;
+
+            _disposed = true;
+        }
+
+        private static readonly CultureInfo _usCulture = CultureInfo.ReadOnly(new CultureInfo("en-US"));
 
         private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {