main.c: load savestate after prepare

diff --git a/Makefile b/Makefile
index 89fc2a9..63241e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ clean_plugins:
 
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 
 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 \
 
 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 (file)
--- 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();
                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();
 
        else
                menu_loop();