mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) Fix core auto-detect

Browse Source
This commit is contained in:
meancoot 2013-11-29 18:19:31 -05:00
parent 717225afce
commit 7a0158bfd7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/iOS/menu.h
View File

@ -169,7 +169,9 @@
@interface RAMenuCoreList : RAMenuBase
@property (nonatomic) NSString* path;
@property (copy) void (^action)(NSString* coreID);
@property (nonatomic) bool actionRan;
- (id)initWithPath:(NSString*)path action:(void (^)(NSString*))action;
- (void)runAction:(NSString*)coreID;
@end
/*********************************************/

20
apple/iOS/menu.m
View File

@ -384,7 +384,7 @@
action: ^(NSString* core)
{
if (path)
apple_run_core(weakSelf.core, path.UTF8String);
apple_run_core(core, path.UTF8String);
else
{
weakSelf.core = core;
@ -392,7 +392,10 @@
[weakSelf.navigationController popViewControllerAnimated:YES];
}
}];
[self.navigationController pushViewController:list animated:YES];
// Don't push view controller if it already launched a game
if (!list.actionRan)
[self.navigationController pushViewController:list animated:YES];
}
- (void)loadGame
@ -767,8 +770,7 @@ static const void* const associated_core_key = &associated_core_key;
- (void)wasSelectedOnTableView:(UITableView*)tableView ofController:(UIViewController*)controller
{
if (self.parent.action)
self.parent.action(self.core);
[self.parent runAction:self.core];
}
@end
@ -816,7 +818,7 @@ static const void* const associated_core_key = &associated_core_key;
core_info_list_get_supported_cores(core_list, _path.UTF8String, &core_support, &core_count);
if (core_count == 1 && _action)
_action(apple_get_core_id(&core_support[0]));
[self runAction:apple_get_core_id(&core_support[0])];
else if (core_count > 1)
[self load:core_count coresFromList:core_support toSection:core_section];
}
@ -826,6 +828,14 @@ static const void* const associated_core_key = &associated_core_key;
return self;
}
- (void)runAction:(NSString*)coreID
{
self.actionRan = true;
if (self.action)
_action(coreID);
}
- (void)load:(uint32_t)count coresFromList:(const core_info_t*)list toSection:(NSMutableArray*)array
{
for (int i = 0; i < count; i ++)