[Scummvm-cvs-logs] SF.net SVN: scummvm: [27745] scummvm/branches/branch-0-10-0/gui/ theme-config.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Jun 27 12:07:46 CEST 2007
Revision: 27745
http://scummvm.svn.sourceforge.net/scummvm/?rev=27745&view=rev
Author: sev
Date: 2007-06-27 03:07:46 -0700 (Wed, 27 Jun 2007)
Log Message:
-----------
Backport patch #1743892: "Fix for segmentation fault in theming code"
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/gui/theme-config.cpp
Modified: scummvm/branches/branch-0-10-0/gui/theme-config.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/gui/theme-config.cpp 2007-06-27 09:53:22 UTC (rev 27744)
+++ scummvm/branches/branch-0-10-0/gui/theme-config.cpp 2007-06-27 10:07:46 UTC (rev 27745)
@@ -611,16 +611,16 @@
if (iterk->key == "use") {
if (iterk->value == name)
error("Theme section [%s]: cannot use itself", name.c_str());
- if (!config.hasSection(name))
- error("Undefined use of section [%s]", name.c_str());
+ if (!config.hasSection(iterk->value))
+ error("Undefined use of section [%s]", iterk->value.c_str());
processResSection(config, iterk->value, true);
continue;
}
if (iterk->key == "useAsIs") {
if (iterk->value == name)
error("Theme section [%s]: cannot use itself", name.c_str());
- if (!config.hasSection(name))
- error("Undefined use of section [%s]", name.c_str());
+ if (!config.hasSection(iterk->value))
+ error("Undefined use of section [%s]", iterk->value.c_str());
processResSection(config, iterk->value);
continue;
}
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