diff options
| author | Cody Robibero <cody@robibe.ro> | 2022-01-22 15:52:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 15:52:12 -0700 |
| commit | ea3d79c0eb10d07f1bb6e653ee0496a7c2ded720 (patch) | |
| tree | 1b6cbe0e89eb892b26c27dcd694c40db785515c1 /Emby.Server.Implementations/Channels/ChannelManager.cs | |
| parent | 3c746f27435a35911635c0ed1382305a1a636c6a (diff) | |
| parent | 2dcb2f8a9f4be9ca69c050ce9ee94d647e8d5d5f (diff) | |
Merge pull request #7235 from Bond-009/async4
Diffstat (limited to 'Emby.Server.Implementations/Channels/ChannelManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Channels/ChannelManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs index 548ebc3fc..a107e7a52 100644 --- a/Emby.Server.Implementations/Channels/ChannelManager.cs +++ b/Emby.Server.Implementations/Channels/ChannelManager.cs @@ -331,7 +331,7 @@ namespace Emby.Server.Implementations.Channels private Channel GetChannelEntity(IChannel channel) { - return GetChannel(GetInternalChannelId(channel.Name)) ?? GetChannel(channel, CancellationToken.None).Result; + return GetChannel(GetInternalChannelId(channel.Name)) ?? GetChannel(channel, CancellationToken.None).GetAwaiter().GetResult(); } private MediaSourceInfo[] GetSavedMediaSources(BaseItem item) |