diff options
| -rw-r--r-- | base/main.cpp | 11 | ||||
| -rw-r--r-- | engines/advancedDetector.cpp | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/base/main.cpp b/base/main.cpp index 385b8f35a9..be561f9766 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -193,13 +193,10 @@ static Common::Error runGame(const Plugin *plugin, OSystem &system, const Common dir.getPath().c_str() ); - // Autoadded is set only when no path was provided and - // the game is run from command line. - // - // Thus, we remove this garbage entry - // - // Fixes bug #1544799 - if (ConfMan.hasKey("autoadded")) { + // If a temporary target failed to launch, remove it from the configuration manager + // so it not visible in the launcher. + // Temporary targets are created when starting games from the command line using the game id. + if (ConfMan.hasKey("id_came_from_command_line")) { ConfMan.removeGameDomain(ConfMan.getActiveDomainName().c_str()); } diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 3167dd9581..6f4efcfb57 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -236,18 +236,6 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) path = ConfMan.get("path"); } else { path = "."; - - // This situation may happen only when game was - // launched from a command line with wrong target and - // no path was provided. - // - // A dummy entry will get created and will keep game path - // We mark this entry, so it will not be added to the - // config file. - // - // Fixes bug #1544799 - ConfMan.setBool("autoadded", true); - warning("No path was provided. Assuming the data files are in the current directory"); } Common::FSNode dir(path); |