X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmain.c;h=d970f8a012e7960838dc468bb524d924027db30e;hb=4b811a8abecf3ca8ee0b8a02214982a87d013e2f;hp=bf3069c0015304058d5dc3cc9271f71be723ba8b;hpb=677b5dd8142b2f98b22a26e4d1757355cba4bdc5;p=libpicofe.git

diff --git a/psp/main.c b/psp/main.c
index bf3069c..d970f8a 100644
--- a/psp/main.c
+++ b/psp/main.c
@@ -10,8 +10,8 @@
 #include "mp3.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
+#include "../common/config.h"
 #include "../common/lprintf.h"
-#include "version.h"
 
 #ifdef GPROF
 #include <pspprof.h>
@@ -31,9 +31,12 @@ void dummy(void)
 
 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 +52,7 @@ int pico_main(void)
 #ifndef GPROF
 				menu_loop();
 #else
-				strcpy(romFileName, currentConfig.lastRomFile);
+				strcpy(romFileName, lastRomFile);
 				engineState = PGS_ReloadRom;
 #endif
 				break;
@@ -66,8 +69,11 @@ int pico_main(void)
 				break;
 
 			case PGS_Suspending:
-				while (engineState == PGS_Suspending)
+				while (engineState == PGS_Suspending || engineState == PGS_SuspendAck) {
+					if (engineState == PGS_Suspending)
+						engineState = PGS_SuspendAck;
 					psp_wait_suspend();
+				}
 				break;
 
 			case PGS_RestartRun: