From 3ce378d264ece4807c14414405fcde344b65f0cc Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 8 Oct 2014 02:42:41 +0200 Subject: [PATCH 1/4] (OSX/iOS) Build fixes for changes in setting_data_get_list --- apple/OSX/settings.m | 12 +++++++----- apple/iOS/menu.m | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m index 5fe2d7992d..e880f829f1 100644 --- a/apple/OSX/settings.m +++ b/apple/OSX/settings.m @@ -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; diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 3942ac2f1b..27b515a02f 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -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 @@ -858,7 +858,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U if (config) { - setting_data_save_config(setting_data_get_list(false), config); + 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); } From 4100f403739104f93323b38e868587a835dd8f8a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 8 Oct 2014 02:45:26 +0200 Subject: [PATCH 2/4] (Menu) Cleanup --- frontend/menu/backend/menu_common_backend.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index f69b3fe33a..659a5d5a38 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -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); From 7babf3c65f838fd4539ddd122f144d1d37d7dfcb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 8 Oct 2014 02:46:23 +0200 Subject: [PATCH 3/4] (iOS) Hide Quit RetroArch option for iOS --- settings_data.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings_data.c b/settings_data.c index c961afe471..b1fa3795cf 100644 --- a/settings_data.c +++ b/settings_data.c @@ -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); From 1898bd93b11a35bf8ed143857c94198cbb3bad4b Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 8 Oct 2014 02:50:54 +0200 Subject: [PATCH 4/4] (iOS) Menu - cleanup --- apple/iOS/menu.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 27b515a02f..e95f870190 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -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(SL_FLAG_ALL_SETTINGS, 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); } }