fly/flightgear
1
0
Fork 0
Code Activity

Improve error messages for system.fgfsrc removal

Browse source 
The original message (b5835c38b4)
was meaningless on Windows
This commit is contained in:
Rebecca N. Palmer 2015-03-20 18:56:13 +00:00
parent 51bfdc21e0
commit 6cc98cb995
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Main/options.cxx
View file

@ -1942,6 +1942,7 @@ void Options::init(int argc, char **argv, const SGPath& appDataPath)
// system.fgfsrc is disabled, as we no longer allow anything in fgdata to set
// fg-root/fg-home/fg-aircraft and hence control what files Nasal can access
std::string name_for_error = homedir.empty() ? appDataConfig.str() : config.str();
if( ! hostname.empty() ) {
config.set(globals->get_fg_root());
config.append( "system.fgfsrc" );
@ -1949,8 +1950,8 @@ void Options::init(int argc, char **argv, const SGPath& appDataPath)
config.concat( hostname );
if (config.exists()) {
flightgear::fatalMessageBox("Unsupported configuration",
"You have a system.fgfsrc." + hostname +" file, which is no longer processed for security reasons",
"If you created this file intentionally, please move it to ~/.fgfsrc" );
"You have a " + config.str() + " file, which is no longer processed for security reasons",
"If you created this file intentionally, please move it to " + name_for_error);
}
}
@ -1958,8 +1959,8 @@ void Options::init(int argc, char **argv, const SGPath& appDataPath)
config.append( "system.fgfsrc" );
if (config.exists()) {
flightgear::fatalMessageBox("Unsupported configuration",
"You have a system.fgfsrc file, which is no longer processed for security reasons",
"If you created this file intentionally, please move it to ~/.fgfsrc" );
"You have a " + config.str() + " file, which is no longer processed for security reasons",
"If you created this file intentionally, please move it to " + name_for_error);
}
}