aboutsummaryrefslogtreecommitdiff
path: root/frontend/main.c
diff options
context:
space:
mode:
authornotaz2010-12-12 01:40:19 +0200
committernotaz2010-12-14 15:25:05 +0200
commit3c70c47bb2fa50066c4c3b23813253e03b8751fe (patch)
tree4f1a9dcfa15ed42879951aa970d016c18f98dbc0 /frontend/main.c
parent722285599b1ce45ca435f484b0f34a5e568487a1 (diff)
downloadpcsx_rearmed-3c70c47bb2fa50066c4c3b23813253e03b8751fe.tar.gz
pcsx_rearmed-3c70c47bb2fa50066c4c3b23813253e03b8751fe.tar.bz2
pcsx_rearmed-3c70c47bb2fa50066c4c3b23813253e03b8751fe.zip
menu: implement savestates and scaling cfg
Diffstat (limited to 'frontend/main.c')
-rw-r--r--frontend/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/frontend/main.c b/frontend/main.c
index bbcd7e4..b05893c 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -15,9 +15,9 @@
#include "plugin.h"
#include "pcnt.h"
+#include "menu.h"
#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
-#include "common/menu.h"
#include "common/plat.h"
#include "common/input.h"
@@ -234,7 +234,9 @@ int main(int argc, char *argv[])
free(state_filename);
}
- if (!ready_to_go)
+ if (ready_to_go)
+ menu_prepare_emu();
+ else
menu_loop();
while (1)