summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-07-24 23:48:43 +0200
committerGitHub <noreply@github.com>2022-07-24 23:48:43 +0200
commit96401b48ec0fe113a92bd933c23e21785d5977d8 (patch)
tree26e18bb46483884f60d4a275c1a33236ef94f1b4
parentb7a47bfc09cc581e27fec051b71f1dfc6c68b7ad (diff)
parentd3a1e82025269ced071a4f72bfb614dda6769a59 (diff)
Merge pull request #63407 from RedMser/install-effect-error
Add error for invalid RichTextLabel.install_effect
-rw-r--r--scene/gui/rich_text_label.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 94e0944628..8f2eb7b3fb 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -4883,11 +4883,10 @@ void RichTextLabel::install_effect(const Variant effect) {
Ref<RichTextEffect> rteffect;
rteffect = effect;
- if (rteffect.is_valid()) {
- custom_effects.push_back(effect);
- if ((!text.is_empty()) && use_bbcode) {
- parse_bbcode(text);
- }
+ ERR_FAIL_COND_MSG(rteffect.is_null(), "Invalid RichTextEffect resource.");
+ custom_effects.push_back(effect);
+ if ((!text.is_empty()) && use_bbcode) {
+ parse_bbcode(text);
}
}