mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2357 from leiradel/master

Browse Source 
fix crashes for cores that don't require content to run
This commit is contained in:
Twinaphex 2015-11-06 22:32:24 +01:00
commit 656903df9e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cheevos.c
View File

@ -1784,6 +1784,10 @@ int cheevos_load(const struct retro_game_info *info)
if (!config_get_ptr()->cheevos.enable) if (!config_get_ptr()->cheevos.enable)
return 0; return 0;
/* Also return OK if there's no content. */
if (!info)
return 0;
memory = core.retro_get_memory_size(RETRO_MEMORY_SYSTEM_RAM); memory = core.retro_get_memory_size(RETRO_MEMORY_SYSTEM_RAM);
memory += core.retro_get_memory_size(RETRO_MEMORY_VIDEO_RAM); memory += core.retro_get_memory_size(RETRO_MEMORY_VIDEO_RAM);
memory += core.retro_get_memory_size(RETRO_MEMORY_RTC); memory += core.retro_get_memory_size(RETRO_MEMORY_RTC);
@ -1792,7 +1796,8 @@ int cheevos_load(const struct retro_game_info *info)
if (!memory) if (!memory)
{ {
rarch_main_msg_queue_push("This core doesn't support achievements", 0, 5 * 60, false); rarch_main_msg_queue_push("This core doesn't support achievements", 0, 5 * 60, false);
//return -1; RARCH_LOG("This core doesn't support achievements\n");
return -1;
} }
/* The the supported extensions as a hint to what method we should use. */ /* The the supported extensions as a hint to what method we should use. */

10
content.c
View File

@ -517,12 +517,12 @@ static bool load_content(const struct retro_subsystem_info *special,
{ {
ret = core.retro_load_game(*content->elems[0].data ? info : NULL); ret = core.retro_load_game(*content->elems[0].data ? info : NULL);
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
/* Load the achievements into memory if the game has content. */ /* Load the achievements into memory if the game has content. */
cheevos_globals.cheats_were_enabled = cheevos_globals.cheats_are_enabled; cheevos_globals.cheats_were_enabled = cheevos_globals.cheats_are_enabled;
cheevos_load(*content->elems[0].data ? info : NULL); cheevos_load(*content->elems[0].data ? info : NULL);
#endif #endif
} }
if (!ret) if (!ret)