diff options
| author | Bond-009 <bond.009@outlook.com> | 2023-02-25 16:44:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-25 16:44:17 +0100 |
| commit | 3b0a182045eea7501ad85737139dfe0b933fe041 (patch) | |
| tree | 109cb0d17c6f52660b71577dd594da1b197600d8 | |
| parent | e5ba1bcba9061ff30bb728f0cc4a5aa9c6eed840 (diff) | |
| parent | c29e8ffe1d1ffe99c895ad228b6cfc5c18fb3b98 (diff) | |
Merge pull request #9326 from ipitio/objdispex
| -rw-r--r-- | CONTRIBUTORS.md | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 20ea7a4ab..c9430b235 100644 --- 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 diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs index fc9ea37d1..0524999c7 100644 --- 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) { |
