X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=643d6fe162e10e0c1d90885ba0c240e9e1495798;hp=15e2be40e2419ac44b51364dfa14e7976592bb00;hb=bbd837c6d8a14e76c19028c84ef62a3b8cf0c1f0;hpb=cd6e8d0f6f7596fc25c30b352d4785e74af3edf6

diff --git a/frontend/main.c b/frontend/main.c
index 15e2be40..643d6fe1 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -163,7 +163,6 @@ int main(int argc, char *argv[])
 	strcpy(Config.Net, "Disabled");
 
 	CheckSubDir();
-//	ScanAllPlugins();
 
 	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
 	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
@@ -209,8 +208,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	SysReset();
 	CheckCdrom();
+	SysReset();
 
 	if (file[0] != '\0') {
 		if (Load(file) != -1)
@@ -423,9 +422,11 @@ static const int builtin_plugin_ids[] = {
 
 void *SysLoadLibrary(const char *lib) {
 	const char *tmp = strrchr(lib, '/');
+	void *ret;
 	int i;
 
-	printf("dlopen %s\n", lib);
+	printf("plugin: %s\n", lib);
+
 	if (tmp != NULL) {
 		tmp++;
 		for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
@@ -440,7 +441,10 @@ void *SysLoadLibrary(const char *lib) {
 	lib = name;
 #endif
 
-	return dlopen(lib, RTLD_NOW);
+	ret = dlopen(lib, RTLD_NOW);
+	if (ret == NULL)
+		fprintf(stderr, "dlopen: %s\n", dlerror());
+	return ret;
 }
 
 void *SysLoadSym(void *lib, const char *sym) {