diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-01 21:45:26 -0200 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-01 21:45:26 -0200 |
| commit | 9d5a2cb8470d538fa33f9f7b4d6cdd5390b3b70b (patch) | |
| tree | 40e4502bd4b0b6ab476b710fb01cb5a98d266911 /core/io | |
| parent | 5eb546e04b54fc583e4078dc89d8b54157f54b5d (diff) | |
| parent | 1ce14e3321fe9e559d0c05401ec82806d5b493e4 (diff) | |
Merge pull request #863 from JIghtuse/master
Fix CppCheck 'duplicateExpression' warning
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/config_file.cpp | 2 | ||||
| -rw-r--r-- | core/io/resource_format_xml.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index b707fd9c13..17ee72f2eb 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -580,7 +580,7 @@ static Variant _decode_variant(const String& p_string) { int w=params[2].to_int(); int h=params[3].to_int(); - if (w == 0 && w == 0) { + if (w == 0 && h == 0) { //r_v = Image(w, h, imgformat); return Image(); }; diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index e6eede7de6..2a79e6647d 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -571,7 +571,7 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name) int w=width.to_int(); int h=height.to_int(); - if (w == 0 && w == 0) { + if (w == 0 && h == 0) { //r_v = Image(w, h, imgformat); r_v=Image(); String sdfsdfg; |