Merge pull request #1554 from MediaBrowser/dev

Dev
2025-07-09 03:04:24 -04:00 · 2016-03-17 12:49:06 -04:00 · 2016-03-17 12:49:06 -04:00 · 021f02554f
commit 021f02554f
parent e2b13e4ea1 4d518e2c95
2 changed files with 963 additions and 104 deletions
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
@ -119,6 +119,8 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks

                var extract = !previouslyFailedImages.Contains(key, StringComparer.OrdinalIgnoreCase);

+                try
+                {
                    var chapters = _itemRepo.GetChapters(video.Id).ToList();

                    var success = await _encodingManager.RefreshChapterImages(new ChapterImageRefreshOptions
@ -147,6 +149,11 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks

                    progress.Report(100 * percent);
                }
+                catch (ObjectDisposedException)
+                {
+                    break;
+                }
+            }
        }

        /// <summary>
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj