aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels/ChannelManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Channels/ChannelManager.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 91bb1cbe6..c02ad177f 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -384,11 +384,15 @@ namespace MediaBrowser.Server.Implementations.Channels
{
var val = width.Value;
- return list
+ var res = list
.OrderBy(i => i.Width.HasValue && i.Width.Value <= val)
- .ThenBy(i => Math.Abs(i.Width ?? 0 - val))
+ .ThenBy(i => Math.Abs((i.Width ?? 0) - val))
.ThenByDescending(i => i.Width ?? 0)
- .ThenBy(list.IndexOf);
+ .ThenBy(list.IndexOf)
+ .ToList();
+
+
+ return res;
}
return list
@@ -533,6 +537,11 @@ namespace MediaBrowser.Server.Implementations.Channels
? null
: _userManager.GetUserById(new Guid(query.UserId));
+ if (!string.IsNullOrWhiteSpace(query.UserId) && user == null)
+ {
+ throw new ArgumentException("User not found.");
+ }
+
var channels = _channels;
if (query.ChannelIds.Length > 0)