aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Channels
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-20 17:38:54 -0400
committerLuke <luke.pulverenti@gmail.com>2016-03-20 17:38:54 -0400
commit03b658ef85e509c3215888e5ec7a85643051e4df (patch)
tree93937e6c38056cbe49c2d87d810337dc12b73869 /MediaBrowser.Server.Implementations/Channels
parent53fc699d7652cc239c327e8c6db455119c25a206 (diff)
parenta2a0e1ae756b3eae6635ebb08ca1cad51898e0b8 (diff)
Merge pull request #1570 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels')
-rw-r--r--MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
index da4a72cd4..08783ae8d 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Implementations.Channels
}
await CleanDatabase(cancellationToken).ConfigureAwait(false);
-
+
progress.Report(100);
}
@@ -167,10 +167,14 @@ namespace MediaBrowser.Server.Implementations.Channels
{
var item = _libraryManager.GetItemById(id);
+ if (item == null)
+ {
+ return Task.FromResult(true);
+ }
+
return _libraryManager.DeleteItem(item, new DeleteOptions
{
DeleteFileLocation = false
-
});
}