CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-03 00:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update diff

Browse Source
This commit is contained in:
twinaphex 2017-05-29 22:21:01 +02:00
parent 67c95d6dfb
commit 68beaa5ffc
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
newdiff.diff
View File

@ -296,10 +296,10 @@ index 57434df31..c49f557a6 100644
{
entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 0e1a2cbdc..728023578 100644
index 0abea01a1..b39c822b4 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -4041,8 +4041,8 @@ static int xmb_list_push(void *data, void *userdata,
@@ -4038,8 +4038,8 @@ static int xmb_list_push(void *data, void *userdata,
entry.parse_type = PARSE_ACTION;
entry.add_empty_entry = false;
@ -536,7 +536,7 @@ index fd36464cc..313f9beb7 100644
sizeof(global->name.savestate));
RARCH_LOG("%s \"%s\".\n",
diff --git a/retroarch.c b/retroarch.c
index b3e12671c..265f4b0c4 100644
index b3e12671c..8cba8e5f7 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1098,7 +1098,7 @@ bool retroarch_validate_game_options(char *s, size_t len, bool mkdir)
@ -574,24 +574,24 @@ index b3e12671c..265f4b0c4 100644
+ if (!string_is_empty(system_info.library_name))
+ runloop_system.info_int.library_name = strdup(system_info.library_name);
+ else
+ runloop_system.info_int.library_name = strdup(msg_hash_to_str(MSG_UNKNOWN));
+ if (!string_is_empty(system_info.library_version))
+ runloop_system.info_int.library_version = strdup(system_info.library_version);
+ else
+ runloop_system.info_int.library_version = strdup("v0");
+ if (!string_is_empty(system_info.valid_extensions))
+ runloop_system.info_int.valid_extensions = strdup(system_info.valid_extensions);
+ else
+ runloop_system.info_int.valid_extensions = strdup(DEFAULT_EXT);
+ runloop_system.info_int.library_name = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE));
- video_driver_set_title_buf();
+ runloop_system.info_int.need_fullpath = system_info.need_fullpath;
+ runloop_system.info_int.block_extract = system_info.block_extract;
+ if (!string_is_empty(system_info.library_version))
+ runloop_system.info_int.library_version = strdup(system_info.library_version);
- strlcpy(runloop_system.valid_extensions,
- runloop_system.info.valid_extensions ?
- runloop_system.info.valid_extensions : DEFAULT_EXT,
- sizeof(runloop_system.valid_extensions));
+ if (!string_is_empty(system_info.valid_extensions))
+ runloop_system.info_int.valid_extensions = strdup(system_info.valid_extensions);
+ else
+ runloop_system.info_int.valid_extensions = strdup(DEFAULT_EXT);
+
+ runloop_system.info_int.need_fullpath = system_info.need_fullpath;
+ runloop_system.info_int.block_extract = system_info.block_extract;
+
+ video_driver_set_title_buf();
+ }
break;
@ -686,3 +686,25 @@ index 6af562de9..885611679 100644
task_push_load_new_core(state->core_path, NULL,
&content_info, CORE_TYPE_PLAIN, NULL, NULL);
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 9c72d2f22..b59dbb788 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -279,7 +279,7 @@ static char** waiting_argv;
if (filenames.count == 1 && [filenames objectAtIndex:0])
{
rarch_system_info_t *info = runloop_get_system_info();
- struct retro_system_info *system = &info->info;
+ struct retro_system_info_internal *system = &info->info_int;
NSString *__core = [filenames objectAtIndex:0];
const char *core_name = NULL;
@@ -355,7 +355,7 @@ static void open_document_handler(ui_browser_window_state_t *state, bool result)
return;
rarch_system_info_t *info = runloop_get_system_info();
- struct retro_system_info *system = &info->info;
+ struct retro_system_info_internal *system = &info->info_int;
const char *core_name = NULL;
if (system)