aboutsummaryrefslogtreecommitdiff
path: root/frontend/menu.c
diff options
context:
space:
mode:
authornotaz2011-01-14 12:31:23 +0200
committernotaz2011-01-16 00:03:53 +0200
commit33f56da1468195445ef123e0c306303d77892a3c (patch)
tree0aff804d5d4ed8aae4e0c44a55c1d817a960daaf /frontend/menu.c
parente16a7e51ca7c72b01c0e93c8593cdc705873dec5 (diff)
downloadpcsx_rearmed-33f56da1468195445ef123e0c306303d77892a3c.tar.gz
pcsx_rearmed-33f56da1468195445ef123e0c306303d77892a3c.tar.bz2
pcsx_rearmed-33f56da1468195445ef123e0c306303d77892a3c.zip
remove hle savestate restriction
we have enough data to load any savestate
Diffstat (limited to 'frontend/menu.c')
-rw-r--r--frontend/menu.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/frontend/menu.c b/frontend/menu.c
index b14f195..05f5481 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -123,8 +123,16 @@ static int emu_save_load_game(int load, int sram)
if (ret != 0)
return 0;
- if (load)
+ if (load) {
ret = LoadState(fname);
+
+ // reflect hle/bios mode from savestate
+ if (Config.HLE)
+ bios_sel = 0;
+ else if (bios_sel == 0 && bioses[1] != NULL)
+ // XXX: maybe find the right bios instead
+ bios_sel = 1;
+ }
else
ret = SaveState(fname);