From 89561b41242d39e1646fd63c00affebf0b7ffdcd Mon Sep 17 00:00:00 2001 From: Kyle Matthew Hedden Date: Tue, 22 Sep 2020 15:37:40 -0400 Subject: [PATCH] sychronize bundled image access to prevent crash --- MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m index e012d2d..27eabb9 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m @@ -380,13 +380,15 @@ static NSString * const STATIC_CACHE_COMPONENT = @"StaticCache.txt"; } - (nullable UIImage *)getImageFromRegisteredBundles:(nonnull NSString *)imageName { - UIImage *image = nil; - for (NSBundle *bundle in self.imageBundles) { - image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil]; - if (image) { - break; + __block UIImage *image = nil; + dispatch_barrier_sync(self.imageCacheQueue, ^{ + for (NSBundle *bundle in self.imageBundles) { + image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil]; + if (image) { + break; + } } - } + }); return image; }