Merge branch 'master' into libretro

libretro · Jan 27, 2025 · 2ff70f0 · 2ff70f0
2 parents 494dead + 168e884
commit 2ff70f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/frontend/libretro.c b/frontend/libretro.c
@@ -1953,15 +1953,13 @@ bool retro_load_game(const struct retro_game_info *info)
    for (i = 0; i < 8; ++i)
       in_type[i] = PSE_PAD_TYPE_STANDARD;
 
-   plugin_call_rearmed_cbs();
-   /* dfinput_activate(); */
-
    if (!is_exe && CheckCdrom() == -1)
    {
       LogErr("unsupported/invalid CD image: %s\n", info->path);
       return false;
    }
 
+   plugin_call_rearmed_cbs();
    SysReset();
 
    if (is_exe)

diff --git a/frontend/main.c b/frontend/main.c
@@ -695,9 +695,9 @@ int main(int argc, char *argv[])
 	if (OpenPlugins() == -1) {
 		return 1;
 	}
-	plugin_call_rearmed_cbs();
 
 	CheckCdrom();
+	plugin_call_rearmed_cbs();
 	SysReset();
 
 	if (file[0] != '\0') {