moved cheevos_load to after retro_load_game so the core has the chance to finish its initialization before cheevos calls retro_get_memory_size

This commit is contained in:
Andre Leiradella 2015-11-06 13:35:45 -02:00
parent 8ff77c5a56
commit ad8f1aaaf6

View File

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