X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=4ebcf34568a2586b6578d1b61d91be8a2e39c2a3;hb=b105cf4f5e168fdce54c6011533df76d196a917b;hp=d3df71472945d8a91a84b10bf8a0daaf7aa9fcd3;hpb=e60da1599d018abcd8256f7a7259678b601d306d;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index d3df7147..4ebcf345 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -364,9 +364,9 @@ int main(int argc, char *argv[])
 		return 1;
 
 	// frontend stuff
+	// init input but leave probing to platform code,
+	// they add input drivers and may need to modify them after probe
 	in_init();
-	in_evdev_init();
-	//in_probe();
 	pl_init();
 	plat_init();
 	menu_init(); // loads config
@@ -730,9 +730,11 @@ void *SysLoadLibrary(const char *lib) {
 
 #if defined(__x86_64__) || defined(__i386__)
 	// convenience hack
-	char name[MAXPATHLEN];
-	snprintf(name, sizeof(name), "%s.x86", lib);
-	lib = name;
+	if (strstr(lib, ".x86") == NULL) {
+		char name[MAXPATHLEN];
+		snprintf(name, sizeof(name), "%s.x86", lib);
+		lib = name;
+	}
 #endif
 
 	ret = dlopen(lib, RTLD_NOW);