diff options
| author | notaz | 2011-02-11 00:31:33 +0200 |
|---|---|---|
| committer | notaz | 2011-02-12 00:08:12 +0200 |
| commit | 45d45c1e22620ef51023d0b8e09e85db9cb9380c (patch) | |
| tree | 61550b1a135d8f653e21a299348953dd178fb8d2 | |
| parent | 384f5f43a20879e2553acd17b76e82059092fafb (diff) | |
| download | pcsx_rearmed-45d45c1e22620ef51023d0b8e09e85db9cb9380c.tar.gz pcsx_rearmed-45d45c1e22620ef51023d0b8e09e85db9cb9380c.tar.bz2 pcsx_rearmed-45d45c1e22620ef51023d0b8e09e85db9cb9380c.zip | |
main.c: load savestate after prepare
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | frontend/main.c | 15 |
2 files changed, 9 insertions, 8 deletions
@@ -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 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(); |