aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/LiveTv
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-15 21:22:22 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-15 21:22:22 -0400
commit233f9cb238201c7dfdb060b718ff635947161f30 (patch)
treeaca23f1b693093b7acf60ba354b5c8bf3637cf12 /MediaBrowser.Server.Implementations/LiveTv
parent5f1e0cf2d344d6fdbc18b09d6ab3552e208434c1 (diff)
update shared components
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 99ab07648..9251ccb9e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1385,6 +1385,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
private QueryResult<BaseItem> GetEmbyRecordings(RecordingQuery query, User user)
{
+ if (user == null || (query.IsInProgress ?? false))
+ {
+ return new QueryResult<BaseItem>();
+ }
+
var folders = EmbyTV.EmbyTV.Current.GetRecordingFolders()
.SelectMany(i => i.Locations)
.Distinct(StringComparer.OrdinalIgnoreCase)
@@ -1413,13 +1418,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return new QueryResult<BaseItem>();
}
- if (user != null && !(query.IsInProgress ?? false))
+ if (_services.Count == 1)
{
- var initialResult = GetEmbyRecordings(query, user);
- if (initialResult.TotalRecordCount > 0)
- {
- return initialResult;
- }
+ return GetEmbyRecordings(query, user);
}
await RefreshRecordings(cancellationToken).ConfigureAwait(false);