release 1.85

This commit is contained in:
notaz 2013-08-31 18:22:59 +03:00
parent 92dfd9afa6
commit 68af34fe20
11 changed files with 80 additions and 51 deletions

View file

@ -348,6 +348,8 @@ static void do_region_override(const char *media_fname)
int emu_reload_rom(const char *rom_fname_in)
{
// use setting before rom config is loaded
int autoload = g_autostateld_opt;
char *rom_fname = NULL;
char ext[5];
enum media_type_e media_type;
@ -491,7 +493,7 @@ int emu_reload_rom(const char *rom_fname_in)
emu_save_load_game(1, 1);
// state autoload?
if (g_autostateld_opt) {
if (autoload) {
int time, newest = 0, newest_slot = -1;
int slot;