#580 : use bundleForClass to load resources

mapbox · Apr 3, 2015 · 1184dad · 1184dad
1 parent 12d45f7
commit 1184dad
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/MapView/Map/RMMapView.m b/MapView/Map/RMMapView.m
@@ -456,9 +456,14 @@ + (UIImage *)resourceImageNamed:(NSString *)imageName
 
 + (NSString *)pathForBundleResourceNamed:(NSString *)name ofType:(NSString *)extension
 {
-    NSAssert([[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"], @"Resource bundle not found in application.");
-
     NSString *bundlePath      = [[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"];
+
+    if (!bundlePath) {
+        bundlePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Mapbox" ofType:@"bundle"];
+    }
+
+    NSAssert(bundlePath, @"Resource bundle not found in application.");
+
     NSBundle *resourcesBundle = [NSBundle bundleWithPath:bundlePath];
 
     return [resourcesBundle pathForResource:name ofType:extension];