diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-17 10:51:45 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-17 10:51:45 -0300 |
| commit | bed3b7f092881223f7b58c26e65d03b052e5313f (patch) | |
| tree | 95ab478c22d3da1273241cde6ab3603bb28e87ea /core | |
| parent | 92f28a50286932b53b16db269aa518201b145b9d (diff) | |
| parent | 0c3f14087cfc2ac10af62aac7cae9b12fd501b9a (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/xml_parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index 6306d22368..1d69f8e5e7 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -34,7 +34,7 @@ VARIANT_ENUM_CAST(XMLParser::NodeType); static bool _equalsn(const CharType* str1, const CharType* str2, int len) { int i; - for(i=0; str1[i] && str2[i] && i < len; ++i) + for(i=0; i < len && str1[i] && str2[i] ; ++i) if (str1[i] != str2[i]) return false; |