aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/UserViews
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-04-28 11:03:34 -0400
committerLuke <luke.pulverenti@gmail.com>2015-04-28 11:03:34 -0400
commit23da60856958e1a219cccafeb002ae182b3f812a (patch)
tree52dfd1706f6ae3c8a6d133a105cc09d07d470db1 /MediaBrowser.Server.Implementations/UserViews
parente14fa7d8e5b8c97eafec6670797958593e4506f8 (diff)
parent0442de79f4d2ad5d577cb7a5220386f23a7b3f12 (diff)
Merge pull request #1089 from MediaBrowser/dev
3.0.5597.0
Diffstat (limited to 'MediaBrowser.Server.Implementations/UserViews')
-rw-r--r--MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index 4a4d90d14..93a9bc8f6 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.UserViews
{
- public class DynamicImageProvider : BaseDynamicImageProvider<UserView>, IPreRefreshProvider
+ public class DynamicImageProvider : BaseDynamicImageProvider<UserView>
{
private readonly IUserManager _userManager;
private readonly ILibraryManager _libraryManager;
@@ -216,7 +216,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty);
}
- protected override bool CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPath, ImageType imageType, int imageIndex)
+ protected override async Task<bool> CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPath, ImageType imageType, int imageIndex)
{
var view = (UserView)item;
if (imageType == ImageType.Primary && IsUsingCollectionStrip(view))
@@ -226,11 +226,11 @@ namespace MediaBrowser.Server.Implementations.UserViews
return false;
}
- CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540, false, item.Name);
+ await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540, false, item.Name).ConfigureAwait(false);
return true;
}
- return base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex);
+ return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
}
protected override IEnumerable<String> GetStripCollageImagePaths(IHasImages primaryItem, IEnumerable<BaseItem> items)