[Scummvm-cvs-logs] SF.net SVN: scummvm:[33551] scummvm/branches/branch-0-12-0/common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Aug 3 00:32:51 CEST 2008
Revision: 33551
http://scummvm.svn.sourceforge.net/scummvm/?rev=33551&view=rev
Author: fingolfin
Date: 2008-08-02 22:32:50 +0000 (Sat, 02 Aug 2008)
Log Message:
-----------
Backported fix for bug #1972625
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/common/advancedDetector.cpp
scummvm/branches/branch-0-12-0/common/config-manager.cpp
Modified: scummvm/branches/branch-0-12-0/common/advancedDetector.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/common/advancedDetector.cpp 2008-08-02 22:32:32 UTC (rev 33550)
+++ scummvm/branches/branch-0-12-0/common/advancedDetector.cpp 2008-08-02 22:32:50 UTC (rev 33551)
@@ -90,6 +90,8 @@
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 {
Modified: scummvm/branches/branch-0-12-0/common/config-manager.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/common/config-manager.cpp 2008-08-02 22:32:32 UTC (rev 33550)
+++ scummvm/branches/branch-0-12-0/common/config-manager.cpp 2008-08-02 22:32:50 UTC (rev 33551)
@@ -328,6 +328,12 @@
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list