From 45d45c1e22620ef51023d0b8e09e85db9cb9380c Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 11 Feb 2011 00:31:33 +0200
Subject: main.c: load savestate after prepare

---
 frontend/main.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'frontend')

diff --git a/frontend/main.c b/frontend/main.c
index 64a16d3..61f023f 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();
 
-- 
cgit v1.2.3