From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 26 May 2013 21:34:56 +0000 (+0200)
Subject: Merge git://github.com/notaz/pcsx_rearmed
X-Git-Tag: r24l~926
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5948832fca5e81cc263bb57d784b6a81c19d1d71;hp=268c669a9bccc1b5ebf0ebd169b540642406d142;p=pcsx_rearmed.git

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

diff --git a/frontend/libretro.c b/frontend/libretro.c
index ed767987..413098d1 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)