From c6a75fa693d355a34e087a7749548f65156990ba Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 17 Aug 2025 04:34:35 +0500 Subject: [PATCH] Fully split off global and local config file loading --- src/86box.c | 3 +++ src/config.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/86box.c b/src/86box.c index 3a9316663..e9c535e02 100644 --- a/src/86box.c +++ b/src/86box.c @@ -1107,6 +1107,9 @@ usage: pclog("# VM Manager enabled. Path: %s\n", vmm_path); } + /* Load the global configuration file. */ + config_load_global(); + if (!vmm_enabled) { /* * We are about to read the configuration file, which MAY diff --git a/src/config.c b/src/config.c index 7384edc87..20227aed6 100644 --- a/src/config.c +++ b/src/config.c @@ -2023,8 +2023,6 @@ config_load(void) int i; ini_section_t c; - config_load_global(); - config_log("Loading VM config file '%s'...\n", cfg_path); memset(hdd, 0, sizeof(hard_disk_t));