empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unconditionally reload hostmemory on loadstate

Browse source 
Hostmemory is associated with system state, so it must be reloaded upon
loadstate, even in preserve input mode.
This commit is contained in:
Ilari Liusvaara 2013-02-17 19:25:20 +02:00
parent a3ecd5ca9d
commit 579b52e3aa
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/moviedata.cpp
View file

@ -345,6 +345,7 @@ void do_load_state(struct moviefile& _movie, int lmode)
throw std::runtime_error("ROM types of movie and loaded ROM don't match");
if(our_rom->orig_region && !our_rom->orig_region->compatible_with(_movie.gametype->get_region()))
throw std::runtime_error("NTSC/PAL select of movie and loaded ROM don't match");
auto _hostmemory = _movie.host_memory;
if(our_rom->rtype && _movie.coreversion != bsnes_core_version) {
if(will_load_state) {
@ -427,6 +428,9 @@ void do_load_state(struct moviefile& _movie, int lmode)
if(!our_movie.is_savestate || lmode == LOAD_STATE_MOVIE) {
our_movie.is_savestate = false;
our_movie.host_memory.clear();
} else {
//Hostmemory must be unconditionally reloaded, even in preserve mode.
our_movie.host_memory = _hostmemory;
}
if(our_movie.prefix != "" && lmode != LOAD_STATE_PRESERVE) {
mprefix.prefix = our_movie.prefix;