Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

2021-09-21 12:15:43 +02:00
parent 0d98f42322 59533b4457
commit d924589d88
5 changed files with 92 additions and 37 deletions
--- a/src/config.c
+++ b/src/config.c
@@ -2015,6 +2015,7 @@ config_load(void)
 	hide_status_bar = 0;
 	scale = 1;
 	machine = machine_get_machine_from_internal_name("ibmpc");
+	dpi_scale = 1;

 	/* Set up the architecture flags. */
 	AT = IS_AT(machine);