From 8ff77c5a569d947943452c43a28f7d96c28de6f9 Mon Sep 17 00:00:00 2001 From: Andre Leiradella Date: Fri, 6 Nov 2015 13:34:34 -0200 Subject: [PATCH 1/2] fixed extension scanner --- cheevos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheevos.c b/cheevos.c index a3d3cd9cd5..b269ba19a1 100644 --- a/cheevos.c +++ b/cheevos.c @@ -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 { From ad8f1aaaf633e5d192740472d49b810cab6d9070 Mon Sep 17 00:00:00 2001 From: Andre Leiradella Date: Fri, 6 Nov 2015 13:35:45 -0200 Subject: [PATCH 2/2] 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 --- content.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content.c b/content.c index 58bc34c4a3..a37f873960 100644 --- a/content.c +++ b/content.c @@ -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)