From a9570f2051d059fe8e7dfa364925d72482f49175 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 13 Jan 2018 13:21:37 +0200 Subject: [PATCH] Do not reset savestate_state. --- od-win32/win32gui.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 613116f2..178681a9 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -2290,18 +2290,14 @@ void gui_display (int shortcut) static void prefs_to_gui (struct uae_prefs *p) { + int st = savestate_state; + default_prefs(&workprefs, false, 0); workprefs = *p; /* filesys hack */ workprefs.mountitems = currprefs.mountitems; memcpy (&workprefs.mountconfig, &currprefs.mountconfig, MOUNT_CONFIG_SIZE * sizeof (struct uaedev_config_info)); - updatewinfsmode (&workprefs); -#if 0 -#ifdef _DEBUG - if (workprefs.gfx_framerate < 5) - workprefs.gfx_framerate = 5; -#endif -#endif + savestate_state = st; } static void gui_to_prefs (void) @@ -20490,7 +20486,6 @@ static int GetSettings (int all_options, HWND hwnd) allow_quit = all_options; pguiprefs = &currprefs; memset (&workprefs, 0, sizeof (struct uae_prefs)); - default_prefs (&workprefs, false, 0); szNone = WIN32GUI_LoadUIString (IDS_NONE); memsize_names[0] = szNone.c_str(); @@ -20787,8 +20782,7 @@ int gui_init (void) { int ret; - read_rom_list (); - default_prefs(&workprefs, false, 0); + read_rom_list(); prefs_to_gui(&changed_prefs); inputdevice_updateconfig(NULL, &workprefs); for (;;) { -- 2.47.3