From: Toni Wilen <twilen@winuae.net>
Date: Sun, 23 Apr 2023 16:15:21 +0000 (+0300)
Subject: Loading and saving default config didn't create identical config file.
X-Git-Tag: 5.0.0~66
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=15899df8aa1c0f3cfcb62a73ebc182dfd97e7382;p=francis%2Fwinuae.git

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

diff --git a/cfgfile.cpp b/cfgfile.cpp
index c30d524f..1a8e2b16 100644
--- 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 e9ace62c..d17c95d0 100644
--- 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 13ad1707..ad10bcf8 100644
--- 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)