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

Fix crash if loading rom with non-default controllers active

Browse source
This commit is contained in:
Ilari Liusvaara 2013-10-08 18:08:56 +03:00
parent 72cc54876a
commit ecd8b74ee1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/moviedata.cpp
View file

@ -352,8 +352,13 @@ void do_load_beginning(bool reload) throw(std::bad_alloc, std::runtime_error)
if(!ro) if(!ro)
lua_callback_movie_lost("reload"); lua_callback_movie_lost("reload");
movb.get_movie().readonly_mode(ro); movb.get_movie().readonly_mode(ro);
if(!ro) if(!ro) {
reinitialize_movie(our_movie.gametype); reinitialize_movie(our_movie.gametype);
//Redo this.
auto ctrldata = our_rom.rtype->controllerconfig(our_movie.settings);
port_type_set& portset = port_type_set::make(ctrldata.ports, ctrldata.portindex());
controls.set_ports(portset);
}
} }
our_rom.rtype->load_sram(our_movie.movie_sram); our_rom.rtype->load_sram(our_movie.movie_sram);