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

# Conflicts: # src/win/win_settings.c
2020-11-18 01:12:32 -03:00
parent dbd767437b 77cb4e6c79
commit 8fff49d5c5
55 changed files with 13362 additions and 7246 deletions
--- a/src/mem/rom.c
+++ b/src/mem/rom.c
@@ -471,7 +471,7 @@ bios_load_linear_combined2(wchar_t *fn1, wchar_t *fn2, wchar_t *fn3, wchar_t *fn
    ret &= bios_load_aux_linear(fn2, 0x000c0000, 65536, off);
    ret &= bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off);
    if (fn5 != NULL)
-	ret &= bios_load_aux_linear(fn5, 0x000ec000, 16384, off);
+	ret &= bios_load_aux_linear(fn5, 0x000ec000, 16384, 0);

    return ret;
 }