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

Add -userconf to force loading of user specific configfile.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3598
This commit is contained in:
Peter Veenstra 2010-05-09 07:52:01 +00:00
parent 9d0ef05f8d
commit 969ab8aeb0
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gui/sdlmain.cpp
View file

@ -1791,7 +1791,28 @@ int main(int argc, char* argv[]) {
/* Parse configuration files */
std::string config_file,config_path;
bool parsed_anyconfigfile = false;
//First Parse -conf switches
//First Parse -userconf
if(control->cmdline->FindExist("-userconf",true)){
config_file.clear();
Cross::GetPlatformConfigDir(config_path);
Cross::GetPlatformConfigName(config_file);
config_path += config_file;
if(control->ParseConfigFile(config_path.c_str())) parsed_anyconfigfile = true;
if(!parsed_anyconfigfile) {
//Try to create the userlevel configfile.
config_file.clear();
Cross::CreatePlatformConfigDir(config_path);
Cross::GetPlatformConfigName(config_file);
config_path += config_file;
if(control->PrintConfig(config_path.c_str())) {
LOG_MSG("CONFIG: Generating default configuration.\nWriting it to %s",config_path.c_str());
//Load them as well. Makes relative paths much easier
if(control->ParseConfigFile(config_path.c_str())) parsed_anyconfigfile = true;
}
}
}
//Second parse -conf entries
while(control->cmdline->FindString("-conf",config_file,true))
if (control->ParseConfigFile(config_file.c_str())) parsed_anyconfigfile = true;