From c7e6b3ca864cc126a32afeb4344e1da5a33eb657 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 10 Oct 2018 07:00:53 +0000 Subject: [PATCH] Report when a -conf file can not be loaded. Make spacing similar between messages. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4166 --- src/gui/sdlmain.cpp | 6 ++++-- src/misc/setup.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index f64f8910..251bdb12 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -2098,9 +2098,11 @@ int main(int argc, char* argv[]) { //Second parse -conf switches while(control->cmdline->FindString("-conf",config_file,true)) { - if(!control->ParseConfigFile(config_file.c_str())) { + if (!control->ParseConfigFile(config_file.c_str())) { // try to load it from the user directory - control->ParseConfigFile((config_path + config_file).c_str()); + if (!control->ParseConfigFile((config_path + config_file).c_str())) { + LOG_MSG("CONFIG: Can't open specified config file: %s",config_file.c_str()); + } } } // if none found => parse localdir conf diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp index 3df23b83..56d836de 100644 --- a/src/misc/setup.cpp +++ b/src/misc/setup.cpp @@ -836,7 +836,7 @@ bool Config::ParseConfigFile(char const * const configfilename) { settings_type = (configfiles.size() == 0)? "primary":"additional"; configfiles.push_back(configfilename); - LOG_MSG("CONFIG:Loading %s settings from config file %s", settings_type,configfilename); + LOG_MSG("CONFIG: Loading %s settings from config file %s", settings_type,configfilename); //Get directory from configfilename, used with relative paths. current_config_dir=configfilename;