From: notaz <notasas@gmail.com>
Date: Thu, 10 Feb 2011 22:31:33 +0000 (+0200)
Subject: main.c: load savestate after prepare
X-Git-Tag: r7~35
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45d45c1e22620ef51023d0b8e09e85db9cb9380c;p=pcsx_rearmed.git

main.c: load savestate after prepare
---

diff --git a/Makefile b/Makefile
index 89fc2a9c..63241e58 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ clean_plugins:
 
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
-VER ?= $(shell git describe --abbrev=0 master)
+VER ?= $(shell git describe master)
 
 rel: pcsx $(PLUGINS) \
 		pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
diff --git a/frontend/main.c b/frontend/main.c
index 64a16d37..61f023f0 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();