diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 21:49:12 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 21:49:12 -0300 |
| commit | dce8a6c251d4da24d70cab6033753895716bc998 (patch) | |
| tree | de2af76b8eba4706028e59b63f5b4298dd1bc594 /scene/gui | |
| parent | 639f7e00165bef9f408e3df4b63b72e06d3f015f (diff) | |
| parent | f3542ff8381fe7e67f39ff004d98c5b40f331fed (diff) | |
Merge pull request #1804 from ricpelo/ricpelo-patch-2
Wrong use of | instead of ||
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 6cdff20aaf..75174a85de 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -489,7 +489,7 @@ void TextEdit::_notification(int p_what) { CharType cc = text[i][j]; //ignore any brackets inside a string - if (cc== '"' | cc == '\'') { + if (cc== '"' || cc == '\'') { CharType quotation = cc; do { j++; @@ -560,7 +560,7 @@ void TextEdit::_notification(int p_what) { CharType cc = text[i][j]; //ignore any brackets inside a string - if (cc== '"' | cc == '\'') { + if (cc== '"' || cc == '\'') { CharType quotation = cc; do { j--; |