[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.33,1.34

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun May 1 22:30:05 CEST 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17720

Modified Files:
	config-manager.cpp 
Log Message:
Don't assert that "domain" is valid. One of the cases where this function
is called is when parsing the command-line, and we can't really expect the
user to always type something sensible.


Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- config-manager.cpp	22 Apr 2005 18:10:02 -0000	1.33
+++ config-manager.cpp	2 May 2005 05:29:50 -0000	1.34
@@ -490,8 +490,7 @@
 
 bool ConfigManager::hasGameDomain(const String &domain) const {
 	assert(!domain.isEmpty());
-	assert(isValidDomainName(domain));
-	return _gameDomains.contains(domain);
+	return isValidDomainName(domain) && _gameDomains.contains(domain);
 }
 
 





More information about the Scummvm-git-logs mailing list