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

Merge branch 'master' of github.com:fr500/RetroArch

Browse Source
This commit is contained in:
AndresSM 2014-10-07 20:21:00 -05:00
commit a637afca04
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apple/OSX/settings.m
View File

@ -128,7 +128,7 @@ NSWindowDelegate>
NSMutableArray* thisGroup = nil;
NSMutableArray* thisSubGroup = nil;
self.settings = [NSMutableArray array];
setting_data = (const rarch_setting_t *)setting_data_get_list(true);
setting_data = (const rarch_setting_t *)setting_data_get_list(SL_FLAG_ALL_SETTINGS, true);
for (i = 0; setting_data[i].type; i ++)
{
@ -246,7 +246,7 @@ NSWindowDelegate>
{
char buffer[PATH_MAX];
rarch_setting_t* setting_data, *setting = NULL;
setting_data = (rarch_setting_t*)setting_data_get_list(false);
setting_data = (rarch_setting_t*)setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
setting = (rarch_setting_t*)&setting_data[[item intValue]];
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
@ -282,7 +282,8 @@ NSWindowDelegate>
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
return [tableColumn dataCell];
setting_data = (const rarch_setting_t *)setting_data_get_list(false);
setting_data = (const rarch_setting_t *)
setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
setting = (const rarch_setting_t *)&setting_data[[item intValue]];
switch (setting->type)
@ -304,7 +305,8 @@ NSWindowDelegate>
if ([item isKindOfClass:[NSNumber class]])
{
rarch_setting_t *setting_data = (rarch_setting_t*)setting_data_get_list(false);
rarch_setting_t *setting_data = (rarch_setting_t*)setting_data_get_list(
SL_FLAG_ALL_SETTINGS, false);
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
switch (setting->type)
@ -334,7 +336,7 @@ NSWindowDelegate>
if ([item isKindOfClass:[NSNumber class]])
{
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(false);
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
NSString *editor_string = (NSString*)editor.string;

14
apple/iOS/menu.m
View File

@ -808,7 +808,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
_pathToSave = BOXSTRING(g_defaults.config_path);
}
setting_data = (rarch_setting_t*)setting_data_get_list(true);
setting_data = (rarch_setting_t*)setting_data_get_list(SL_FLAG_ALL_SETTINGS, true);
setting_data_load_config_path(setting_data, _pathToSave.UTF8String);
// HACK: Load the key mapping table
@ -856,12 +856,12 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
{
config_file_t* config = (config_file_t*)config_file_new(self.pathToSave.UTF8String);
if (config)
{
setting_data_save_config(setting_data_get_list(false), config);
config_file_write(config, self.pathToSave.UTF8String);
config_file_free(config);
}
if (!config)
return;
setting_data_save_config(setting_data_get_list(SL_FLAG_ALL_SETTINGS, false), config);
config_file_write(config, self.pathToSave.UTF8String);
config_file_free(config);
}
}

3
frontend/menu/backend/menu_common_backend.c
View File

@ -53,9 +53,8 @@ static int menu_message_toggle(unsigned action)
{
if (driver.video_data && driver.menu_ctx
&& driver.menu_ctx->render_messagebox)
{
driver.menu_ctx->render_messagebox(driver.menu->message_contents);
}
if (action == MENU_ACTION_OK)
menu_entries_pop(driver.menu->menu_stack);

3
settings_data.c
View File

@ -2406,6 +2406,8 @@ bool setting_data_append_list_main_menu_options(
general_read_handler);
settings_list_current_add_flags(list, list_info, SD_FLAG_PUSH_ACTION);
/* Apple rejects iOS apps that lets you forcibly quit an application. */
#if !defined(IOS)
CONFIG_BOOL(
lists[18],
"quit_retroarch",
@ -2419,6 +2421,7 @@ bool setting_data_append_list_main_menu_options(
general_read_handler);
settings_list_current_add_cmd(list, list_info, RARCH_CMD_QUIT_RETROARCH);
settings_list_current_add_flags(list, list_info, SD_FLAG_PUSH_ACTION);
#endif
END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info);