claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fully split off global and local config file loading

Browse Source
This commit is contained in:
Alexander Babikov
2025-08-17 04:34:35 +05:00
parent d7aee604c4
commit c6a75fa693
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/86box.c
View File

@@ -1107,6 +1107,9 @@ usage:
pclog("# VM Manager enabled. Path: %s\n", vmm_path); pclog("# VM Manager enabled. Path: %s\n", vmm_path);
} }
/* Load the global configuration file. */
config_load_global();
if (!vmm_enabled) { if (!vmm_enabled) {
/* /*
* We are about to read the configuration file, which MAY * We are about to read the configuration file, which MAY

2
src/config.c
View File

@@ -2023,8 +2023,6 @@ config_load(void)
int i; int i;
ini_section_t c; ini_section_t c;
config_load_global();
config_log("Loading VM config file '%s'...\n", cfg_path); config_log("Loading VM config file '%s'...\n", cfg_path);
memset(hdd, 0, sizeof(hard_disk_t)); memset(hdd, 0, sizeof(hard_disk_t));