Loading and saving default config didn't create identical config file.

diff --git a/cfgfile.cpp b/cfgfile.cpp
index c30d524fc9d9f4f29226653da48a99479f0b01e9..1a8e2b1638ab5e8b22e70157958c49bb050dfcaa 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -8524,7 +8524,7 @@ void default_prefs (struct uae_prefs *p, bool reset, int type)
        p->fpu_model = 0;
        p->cpu_model = 68000;
        p->m68k_speed_throttle = 0;
-       p->cpu_clock_multiplier = 0;
+       p->cpu_clock_multiplier = 2 * 256;
        p->cpu_frequency = 0;
        p->mmu_model = 0;
        p->cpu060_revision = 6;

diff --git a/inputdevice.cpp b/inputdevice.cpp
index e9ace62c1fb6f0149a883925275c3509b0ef8d63..d17c95d04fcb1f3f387287bcd037e94746bd1cac 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -7589,7 +7589,10 @@ static void disableifempty (struct uae_prefs *prefs)
                if (!input_get_default_keyboard(l))
                        disableifempty2 (&keyboards[l]);
        }
+       // Configuration #1-#3
        prefs->internalevent_settings[0]->enabled = true;
+       prefs->internalevent_settings[1]->enabled = true;
+       prefs->internalevent_settings[2]->enabled = true;
 }
 
 static void matchdevices(struct uae_prefs *p, struct inputdevice_functions *inf, struct uae_input_device *uid, int devnum, int match_mask)

diff --git a/main.cpp b/main.cpp
index 13ad1707bf8ce92662df4f80e4749954c51c09d4..ad10bcf8a7d6ffa14b617eed63923d202897b3c4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1127,6 +1127,7 @@ static int real_main2 (int argc, TCHAR **argv)
        inputdevice_init ();
 
        copy_prefs(&currprefs, &changed_prefs);
+       inputdevice_updateconfig(&currprefs, &changed_prefs);
 
        no_gui = ! currprefs.start_gui;
        if (restart_program == 2 || restart_program == 4)