diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-27 08:23:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 08:23:17 +0200 |
| commit | ab460e7a6f08283baff7f5e84ad355db9ef5245f (patch) | |
| tree | ae38246fb311940b86839c309926924c5aa397b1 /modules/gdscript | |
| parent | 9daee31ba991cb7306d316fcbe4dcab27c022be8 (diff) | |
| parent | f29a2e2606317e0964ffed287187afe6bf115626 (diff) | |
Merge pull request #39074 from vnen/gdscript-assert-message
Fix assert message when no custom message is set
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_function.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index fc0c4b3138..37177a8cfd 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -1430,11 +1430,14 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a #ifdef DEBUG_ENABLED GET_VARIANT_PTR(test, 1); - GET_VARIANT_PTR(message, 2); bool result = test->booleanize(); if (!result) { - const String &message_str = *message; + String message_str; + if (_code_ptr[ip + 2] != 0) { + GET_VARIANT_PTR(message, 2); + message_str = *message; + } if (message_str.empty()) { err_text = "Assertion failed."; } else { |