X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Fmain.c;h=4c7eef62a7a656e0e0f0f89eee3f0c4efbded2fc;hb=1850d43f8f90b126e8d8a0db5c77536521fd7bf5;hp=dbe20b7c122d2b6c1352f760a2ceb07a1724e785;hpb=7d0143a2de0f5551c90b29c1b1ee94e9c52b0952;p=picodrive.git

diff --git a/platform/psp/main.c b/platform/psp/main.c
index dbe20b7..4c7eef6 100644
--- a/platform/psp/main.c
+++ b/platform/psp/main.c
@@ -10,6 +10,7 @@
 #include "mp3.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
+#include "../common/config.h"
 #include "../common/lprintf.h"
 #include "version.h"
 
@@ -33,7 +34,11 @@ int pico_main(void)
 {
 	lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
 	psp_init();
+
+	emu_prepareDefaultConfig();
 	emu_ReadConfig(0, 0);
+	config_readlrom(PicoConfigFile);
+
 	emu_Init();
 	menu_init();
 	// moved to emu_Loop(), after CPU clock change..
@@ -49,7 +54,7 @@ int pico_main(void)
 #ifndef GPROF
 				menu_loop();
 #else
-				strcpy(romFileName, currentConfig.lastRomFile);
+				strcpy(romFileName, lastRomFile);
 				engineState = PGS_ReloadRom;
 #endif
 				break;
@@ -66,13 +71,18 @@ int pico_main(void)
 				break;
 
 			case PGS_Suspending:
-				psp_wait_suspend();
+				while (engineState == PGS_Suspending)
+					psp_wait_suspend();
 				break;
 
 			case PGS_RestartRun:
 				engineState = PGS_Running;
 
 			case PGS_Running:
+				if (psp_unhandled_suspend) {
+					psp_resume_suspend();
+					emu_HandleResume();
+				}
 				emu_Loop();
 #ifdef GPROF
 				goto endloop;