diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-11 13:27:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 13:27:51 +0100 |
| commit | 6b1628f9fcc50dc16af08c2b87f27108ff6e15c5 (patch) | |
| tree | 5bb1ef20e714dc1d9a8421ee2419036534d2f230 /modules/gdscript | |
| parent | 5c038acdc159708113fdc911c44abf1d6dcdbdf7 (diff) | |
| parent | 83069a3c0f01507acd24672c90b24c9eba868aba (diff) | |
| download | redot-engine-6b1628f9fcc50dc16af08c2b87f27108ff6e15c5.tar.gz | |
Merge pull request #33517 from madmiraal/fix-_MSG-macros
Send *_MSG macros' explanations directly to the _err_print_error().
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_function.cpp | 3 | ||||
| -rw-r--r-- | modules/gdscript/language_server/gdscript_workspace.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index d8816726ce..0a01321851 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -397,8 +397,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a if (unlikely(m_cond)) { \ _err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition ' " _STR(m_cond) " ' is true. Breaking..:"); \ OPCODE_BREAK; \ - } else \ - _err_error_exists = false; \ + } \ } #define CHECK_SPACE(m_space) \ diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index c289ff6c07..f2c0e7035b 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -117,8 +117,7 @@ void GDScriptWorkspace::reload_all_workspace_scripts() { if (S) { err_msg += "\n" + S->get()->get_error(); } - ERR_EXPLAIN(err_msg); - ERR_CONTINUE(err != OK); + ERR_CONTINUE_MSG(err != OK, err_msg); } } } |