Merge git://github.com/notaz/pcsx_rearmed

diff --git a/frontend/libretro.c b/frontend/libretro.c
index ed76798..413098d 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -650,6 +650,7 @@ bool retro_load_game(const struct retro_game_info *info)
        }
 
        plugin_call_rearmed_cbs();
+       dfinput_activate();
 
        Config.PsxAuto = 1;
        if (CheckCdrom() == -1) {
@@ -787,9 +788,9 @@ static void update_variables(bool in_flight)
                        GPU_close();
                        GPU_open(&gpuDisp, "PCSX", NULL);
                }
-       }
 
-       dfinput_activate();
+               dfinput_activate();
+       }
 }
 
 void retro_run(void)