Merge pull request #2355 from leiradel/master

fixes to extension scanner and cheevos support detection
This commit is contained in:
Twinaphex 2015-11-06 17:08:27 +01:00
commit fb7712efd3
2 changed files with 8 additions and 8 deletions

View File

@ -1814,7 +1814,7 @@ int cheevos_load(const struct retro_game_info *info)
if (end)
{
hash = cheevos_djb2(ext, end - ext);
ext++;
ext = end + 1;
}
else
{

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)