aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Channels/ChannelManager.cs
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-01-24 23:02:10 -0500
committerGitHub <noreply@github.com>2019-01-24 23:02:10 -0500
commitfe197415cac19c0e4005c52761c5e7a37b8a4557 (patch)
tree5e9d98741b36bad49b6121b6e54f46772b5a3eda /Emby.Server.Implementations/Channels/ChannelManager.cs
parent0231bd88a72286e34ae42cba051f6daab8f45b81 (diff)
parent722120af74fadc1dfb43f1535797464a0ba63ba9 (diff)
Merge pull request #657 from Bond-009/true
Remove conditions that are always true/false
Diffstat (limited to 'Emby.Server.Implementations/Channels/ChannelManager.cs')
-rw-r--r--Emby.Server.Implementations/Channels/ChannelManager.cs15
1 files changed, 5 insertions, 10 deletions
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 660547c85..a306b0169 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -681,22 +681,17 @@ namespace Emby.Server.Implementations.Channels
// Find the corresponding channel provider plugin
var channelProvider = GetChannelProvider(channel);
- var user = query.User;
-
- ChannelItemSortField? sortField = null;
- var sortDescending = false;
-
- var parentItem = !query.ParentId.Equals(Guid.Empty) ? _libraryManager.GetItemById(query.ParentId) : channel;
+ var parentItem = query.ParentId == Guid.Empty ? channel : _libraryManager.GetItemById(query.ParentId);
var itemsResult = await GetChannelItems(channelProvider,
- user,
+ query.User,
parentItem is Channel ? null : parentItem.ExternalId,
- sortField,
- sortDescending,
+ null,
+ false,
cancellationToken)
.ConfigureAwait(false);
- if (query.ParentId.Equals(Guid.Empty))
+ if (query.ParentId == Guid.Empty)
{
query.Parent = channel;
}