diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/advancedDetector.cpp | 2 | ||||
| -rw-r--r-- | common/config-manager.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index 8bd019018a..522b24163e 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -94,6 +94,8 @@ static void upgradeTargetIfNecessary(const Common::ADParams ¶ms) { warning("Target upgraded from %s to %s", o->from, o->to); + // WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching + // undefined target adds launcher entry" if (ConfMan.hasKey("id_came_from_command_line")) { warning("Target came from command line. Skipping save"); } else { diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 044474a927..40fef1a622 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -324,6 +324,12 @@ void ConfigManager::writeDomain(WriteStream &stream, const String &name, const D if (domain.empty()) return; // Don't bother writing empty domains. + // WORKAROUND: Fix for bug #1972625 "ALL: On-the-fly targets are + // written to the config file": Do not save domains that came from + // the command line + if (domain.contains("id_came_from_command_line")) + return; + String comment; // Write domain comment (if any) |