Merge branch 'bugfix/bundle_image_access_crash' into 'develop'

sychronize bundled image access to prevent crash

See merge request BPHV_MIPS/mvm_core!110
This commit is contained in:
Hedden, Kyle Matthew 2020-09-29 12:59:26 -04:00
commit ae94a2f197

View File

@ -380,13 +380,15 @@ static NSString * const STATIC_CACHE_COMPONENT = @"StaticCache.txt";
} }
- (nullable UIImage *)getImageFromRegisteredBundles:(nonnull NSString *)imageName { - (nullable UIImage *)getImageFromRegisteredBundles:(nonnull NSString *)imageName {
UIImage *image = nil; __block UIImage *image = nil;
for (NSBundle *bundle in self.imageBundles) { dispatch_barrier_sync(self.imageCacheQueue, ^{
image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil]; for (NSBundle *bundle in self.imageBundles) {
if (image) { image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
break; if (image) {
break;
}
} }
} });
return image; return image;
} }