Split identifier/folder in $pathForFile$inBundle$.

diff --git a/Library.mm b/Library.mm
index 28f508558857828113c91a32554ed2772a0e40f5..dbc1995f2dab7b018ce36d21bcc6d0c27e409edc 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -329,13 +329,12 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
 }
 // }}}
 // $pathForFile$inBundle$() {{{
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) {
-    NSString *identifier = [bundle bundleIdentifier];
+static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSString *folder, bool ui, bool use) {
     NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
 
     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
-    if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
+    if (folder != nil) {
         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
         NSString *base([folder stringByDeletingPathExtension]);
         if ([base hasSuffix:@"~iphone"])
@@ -371,6 +370,10 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
 
     return nil;
 }
+
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) {
+    return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [[bundle bundlePath] lastPathComponent], ui, use);
+}
 // }}}
 
 static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {