aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/LiveTv
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-02-11 13:41:22 -0500
committerLuke <luke.pulverenti@gmail.com>2016-02-11 13:41:22 -0500
commit4a1d01be030e5ffb4e367597c7beabaa4e4da887 (patch)
treec42dfd5f233e5eafc560c5bc1a60a2edb1b574cd /MediaBrowser.Server.Implementations/LiveTv
parent46a6194516d0445da943ead5a31b72bb25eb6663 (diff)
parent9e8d35dadc2859d39c3daab98458fd9d1be03865 (diff)
Merge pull request #1441 from MediaBrowser/dev
merge from dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 1e878f28c..dcebc0c42 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1592,18 +1592,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var internalResult = await GetInternalRecordings(query, cancellationToken).ConfigureAwait(false);
- var returnArray = internalResult.Items
- .Select(i => _dtoService.GetBaseItemDto(i, options, user))
+ var tuples = internalResult.Items
+ .Select(i => new Tuple<BaseItem, BaseItemDto>(i, _dtoService.GetBaseItemDto(i, options, user)))
.ToArray();
if (user != null)
{
- _dtoService.FillSyncInfo(returnArray, new DtoOptions(), user);
+ _dtoService.FillSyncInfo(tuples, new DtoOptions(), user);
}
return new QueryResult<BaseItemDto>
{
- Items = returnArray,
+ Items = tuples.Select(i => i.Item2).ToArray(),
TotalRecordCount = internalResult.TotalRecordCount
};
}
@@ -1684,6 +1684,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
}
+ _lastRecordingRefreshTime = DateTime.MinValue;
+
// This is the responsibility of the live tv service
await _libraryManager.DeleteItem((BaseItem)recording, new DeleteOptions
{