mirror of
https://github.com/scummvm/scummvm.git
synced 2026-11-18 21:34:48 +00:00
Fix for bug #1719463: "DETECTOR: Launching undefined target adds launcher entry"
svn-id: r27352
This commit is contained in:
1 parent
e63041fcb7
commit
add3243e5e
2 files changed
+22
-1
No files matched your search
@@ -642,7 +642,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());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user