diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-23 12:08:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 12:08:03 -0400 |
| commit | ad5ceb2cb4352270598c226767ab78460fe6718a (patch) | |
| tree | 1a804fbb76aeb5205a065d3f742609e7bab4020e /Emby.Server.Implementations/Channels/ChannelManager.cs | |
| parent | d4b50a18e1c639f98cb26250c4d1dccbfcc49185 (diff) | |
| parent | 023952d04df3765ee5574915f0a84903bb97a748 (diff) | |
Merge pull request #2723 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Channels/ChannelManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Channels/ChannelManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs index 73878160c9..85f6c66673 100644 --- a/Emby.Server.Implementations/Channels/ChannelManager.cs +++ b/Emby.Server.Implementations/Channels/ChannelManager.cs @@ -23,7 +23,7 @@ using System.Linq; using System.Net; using System.Threading; using System.Threading.Tasks; - +using MediaBrowser.Common.Progress; using MediaBrowser.Model.IO; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; @@ -980,7 +980,7 @@ namespace Emby.Server.Implementations.Channels ? null : _userManager.GetUserById(query.UserId); - var internalResult = await GetChannelItemsInternal(query, new Progress<double>(), cancellationToken).ConfigureAwait(false); + var internalResult = await GetChannelItemsInternal(query, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false); var dtoOptions = new DtoOptions() { |