diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-01 14:32:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 14:32:04 +0200 |
| commit | b0ce9401ffa731cc346ab6762fd0794709634428 (patch) | |
| tree | c2e6de01b9efec28c959dbfd5cd59a0973d432e7 /core/engine.cpp | |
| parent | 531c92a53e5e7b9a1cb55249ef6086e874239872 (diff) | |
| parent | 3c154eb93b3a098354bf6d18a9428826ec193f90 (diff) | |
Merge pull request #30126 from qarmin/remove_unnecessary_code
Remove unnecessary code and add some error explanations
Diffstat (limited to 'core/engine.cpp')
| -rw-r--r-- | core/engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 50822244cf..2d8473fbd9 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -197,8 +197,10 @@ void Engine::add_singleton(const Singleton &p_singleton) { Object *Engine::get_singleton_object(const String &p_name) const { const Map<StringName, Object *>::Element *E = singleton_ptrs.find(p_name); - ERR_EXPLAIN("Failed to retrieve non-existent singleton '" + p_name + "'"); - ERR_FAIL_COND_V(!E, NULL); + if (!E) { + ERR_EXPLAIN("Failed to retrieve non-existent singleton '" + p_name + "'"); + ERR_FAIL_V(NULL); + } return E->get(); }; |