aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2013-05-26 23:34:56 +0200
committertwinaphex2013-05-26 23:34:56 +0200
commit5948832fca5e81cc263bb57d784b6a81c19d1d71 (patch)
tree19b423be5876fcd8183d5bf77316135093f8fd11
parent268c669a9bccc1b5ebf0ebd169b540642406d142 (diff)
parent19a784e63f95b0eb32d252fabb144531f695a983 (diff)
downloadpcsx_rearmed-5948832fca5e81cc263bb57d784b6a81c19d1d71.tar.gz
pcsx_rearmed-5948832fca5e81cc263bb57d784b6a81c19d1d71.tar.bz2
pcsx_rearmed-5948832fca5e81cc263bb57d784b6a81c19d1d71.zip
Merge git://github.com/notaz/pcsx_rearmed
-rw-r--r--frontend/libretro.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c
index ed76798..413098d 100644
--- 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)