X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=32b12eaa2a24e484e9c8e8a0dd70d009cf1a8b86;hp=64a16d37bf9ea2db92906d49bfe1fe0b09d4c533;hb=274c424338d914fdc0076306c769ba4fadeebdaa;hpb=8f8926485e641efb187ff9ae11cef9d23d1e8982

diff --git a/frontend/main.c b/frontend/main.c
index 64a16d37..32b12eaa 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -288,14 +288,15 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	// If a state has been specified, then load that
-	if (loadst) {
-		int ret = emu_load_state(loadst - 1);
-		printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
-	}
-
-	if (ready_to_go)
+	if (ready_to_go) {
 		menu_prepare_emu();
+
+		// If a state has been specified, then load that
+		if (loadst) {
+			int ret = emu_load_state(loadst - 1);
+			printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
+		}
+	}
 	else
 		menu_loop();
 
@@ -374,8 +375,8 @@ void OnFile_Exit() {
 #ifndef MAEMO
 	menu_finish();
 #endif
-	plat_finish();
 	SysClose();
+	plat_finish();
 	exit(0);
 }