Merge branch 'master' of https://github.com/86Box/86Box

2023-08-23 01:16:02 +02:00
parent 6a23499051 18d2a030ce
commit 6f4a3ebb9e
14 changed files with 87 additions and 86 deletions
--- a/src/cpu/x86.c
+++ b/src/cpu/x86.c
@@ -356,7 +356,7 @@ softresetx86(void)
    if (soft_reset_mask)
        return;

-    if (ibm8514_enabled || xga_enabled)
+    if (ibm8514_active || xga_active)
        vga_on = 1;

    reset_common(0);