Merge pull request #9326 from ipitio/objdispex

1 year ago · 3b0a182045
parent e5ba1bcba9 c29e8ffe1d
commit 3b0a182045
2 changed files with 6 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -163,6 +163,7 @@
 - [vgambier](https://github.com/vgambier)
 - [MinecraftPlaye](https://github.com/MinecraftPlaye)
 - [RealGreenDragon](https://github.com/RealGreenDragon)
+ - [ipitio](https://github.com/ipitio)

 # Emby Contributors

--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@ -232,6 +232,11 @@ namespace MediaBrowser.Controller.Net
                // TODO Investigate and properly fix.
                Logger.LogError(ex, "Object Disposed");
            }
+            catch (Exception ex)
+            {
+                // TODO Investigate and properly fix.
+                Logger.LogError(ex, "Error disposing websocket");
+            }

            lock (_activeConnections)
            {