thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged the FSNode branch with trunk r27031:27680

Browse source 
svn-id: r27681
This commit is contained in:
David Corrales 2007-06-23 18:51:33 +00:00
commit cacd7a28fd
358 changed files with 9066 additions and 46890 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/commandLine.cpp
View file

@ -659,7 +659,23 @@ bool processSettings(Common::String &command, Common::StringMap &settings) {
if (!command.empty()) {
GameDescriptor gd = Base::findGame(command);
if (ConfMan.hasGameDomain(command) || !gd.gameid().empty()) {
bool idCameFromCommandLine = false;
// WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching
// undefined target adds launcher entry"
//
// We designate gameids which come strictly from command line
// so AdvancedDetector will not save config file with invalid
// gameid in case target autoupgrade was performed
if (!ConfMan.hasGameDomain(command)) {
idCameFromCommandLine = true;
}
ConfMan.setActiveDomain(command);
if (idCameFromCommandLine)
ConfMan.set("id_came_from_command_line", "1");
} else {
usage("Unrecognized game target '%s'", command.c_str());
}