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

diff --git a/frontend/main.c b/frontend/main.c
index 15e2be40..0427ce4c 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010
+ * (C) notaz, 2010-2011
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -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");
@@ -208,9 +207,10 @@ int main(int argc, char *argv[])
 	if (OpenPlugins() == -1) {
 		return 1;
 	}
+	plugin_call_rearmed_cbs();
 
-	SysReset();
 	CheckCdrom();
+	SysReset();
 
 	if (file[0] != '\0') {
 		if (Load(file) != -1)
@@ -298,6 +298,7 @@ void UpdateMenuSlots() {
 
 void OnFile_Exit() {
 	printf("OnFile_Exit\n");
+	menu_finish();
 	plat_finish();
 	SysClose();
 	exit(0);
@@ -423,9 +424,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 +443,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) {