Skip to content

Commit

Permalink
FadeAnimationEnabledForCached is now independent of FadeAnimationEnabled
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-luberda committed Jan 2, 2017
1 parent 77718a8 commit 913cc1f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions source/FFImageLoading.Common/Work/ImageLoaderTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,8 @@ public async virtual Task<bool> TryLoadFromMemoryCacheAsync()
if (Parameters.Preload && Parameters.CacheType.HasValue && Parameters.CacheType.Value == CacheType.Disk)
return false;

bool isFadeAnimationEnabled = Parameters.FadeAnimationEnabled.HasValue ? Parameters.FadeAnimationEnabled.Value : Configuration.FadeAnimationEnabled;
bool isFadeAnimationEnabledForCached = Parameters.FadeAnimationForCachedImagesEnabled.HasValue ? Parameters.FadeAnimationForCachedImagesEnabled.Value : Configuration.FadeAnimationForCachedImages;
var result = await TryLoadFromMemoryCacheAsync(Key, true, isFadeAnimationEnabled && isFadeAnimationEnabledForCached, false).ConfigureAwait(false);
var result = await TryLoadFromMemoryCacheAsync(Key, true, isFadeAnimationEnabledForCached, false).ConfigureAwait(false);

if (result)
{
Expand Down

0 comments on commit 913cc1f

Please sign in to comment.