1 files changed, 25 insertions, 12 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
index 67ddcc5cc..0ba3ba344 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Controller.Library;
 
 namespace MediaBrowser.Server.Implementations.MediaEncoder
 {
@@ -24,6 +25,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
         private readonly ILogger _logger;
         private readonly IMediaEncoder _encoder;
         private readonly IChapterManager _chapterManager;
+        private readonly ILibraryManager _libraryManager;
 
         public EncodingManager(IFileSystem fileSystem, 
             ILogger logger, 
@@ -57,27 +59,38 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
                 return false;
             }
 
-            var options = _chapterManager.GetConfiguration();
-
-            if (video is Movie)
+            var libraryOptions = _libraryManager.GetLibraryOptions(video);
+            if (libraryOptions != null && libraryOptions.SchemaVersion >= 2)
             {
-                if (!options.EnableMovieChapterImageExtraction)
+                if (!libraryOptions.EnableChapterImageExtraction)
                 {
                     return false;
                 }
             }
-            else if (video is Episode)
+            else
             {
-                if (!options.EnableEpisodeChapterImageExtraction)
+                var options = _chapterManager.GetConfiguration();
+
+                if (video is Movie)
                 {
-                    return false;
+                    if (!options.EnableMovieChapterImageExtraction)
+                    {
+                        return false;
+                    }
                 }
-            }
-            else
-            {
-                if (!options.EnableOtherVideoChapterImageExtraction)
+                else if (video is Episode)
                 {
-                    return false;
+                    if (!options.EnableEpisodeChapterImageExtraction)
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (!options.EnableOtherVideoChapterImageExtraction)
+                    {
+                        return false;
+                    }
                 }
             }