[Scummvm-cvs-logs] SF.net SVN: scummvm:[33550] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 33550
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33550&view=rev
Author:   fingolfin
Date:     2008-08-02 22:32:32 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Fix for bug #1972625 'ALL: On-the-fly targets are written to the config file'

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/common/config-manager.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2008-08-02 22:20:31 UTC (rev 33549)
+++ scummvm/trunk/common/advancedDetector.cpp	2008-08-02 22:32:32 UTC (rev 33550)
@@ -94,6 +94,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/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2008-08-02 22:20:31 UTC (rev 33549)
+++ scummvm/trunk/common/config-manager.cpp	2008-08-02 22:32:32 UTC (rev 33550)
@@ -324,6 +324,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.