Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop

This commit is contained in:
Kevin G Christiano 2020-09-30 08:57:42 -04:00
commit 3525139f7a

View File

@ -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;
}