valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Report when a -conf file can not be loaded. Make spacing similar between messages.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4166
This commit is contained in:
Peter Veenstra 2018-10-10 07:00:53 +00:00
parent f522e81d32
commit c7e6b3ca86
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/sdlmain.cpp
View file

@ -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

2
src/misc/setup.cpp
View file

@ -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;