aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
diff options
context:
space:
mode:
authorLogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>2019-01-01 11:47:57 -0800
committerGitHub <noreply@github.com>2019-01-01 11:47:57 -0800
commit443218e3f109cdfbffa8c8c5d30e09e3ba5c2285 (patch)
tree6de8dee799eebba514bac0b6eac457b4c0137978 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
parent0c52f448a0c6d5cd3c5cce597fcf3ad9582c90f1 (diff)
parentcff0ece07329bbfa05fd22fbde444d09aaeb9a5c (diff)
Merge pull request #4 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 3d2871e65..c8c2367e6 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -8,10 +8,10 @@ using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Session;
+using Microsoft.Extensions.Logging;
namespace MediaBrowser.Controller.MediaEncoding
{
@@ -727,7 +727,6 @@ namespace MediaBrowser.Controller.MediaEncoding
return count;
}
-
protected void DisposeIsoMount()
{
if (IsoMount != null)
@@ -738,7 +737,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
catch (Exception ex)
{
- _logger.ErrorException("Error disposing iso mount", ex);
+ _logger.LogError(ex, "Error disposing iso mount");
}
IsoMount = null;