diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-08 12:11:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 12:11:16 +0100 |
| commit | 15a5c975911ee1c7f4e6de387e736ac55e529cfc (patch) | |
| tree | b8b74aefc2822af3ea220d19497b14136e9d95d0 | |
| parent | 9dcbf961e504fa783b08395ea7e10f35ff4d0ab3 (diff) | |
| parent | fb2eb66e40269d91b8e2392d52fff2a54cb32ebd (diff) | |
Merge pull request #25546 from Zylann/fix_garbage_log_pointer
Fixed uninitialized pointer access due to THEME_CHANGED notification
| -rw-r--r-- | editor/editor_log.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 803d7e10f7..1658f19ccc 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -132,7 +132,6 @@ void EditorLog::_bind_methods() { EditorLog::EditorLog() { VBoxContainer *vb = this; - add_constant_override("separation", get_constant("separation", "VBoxContainer")); HBoxContainer *hb = memnew(HBoxContainer); vb->add_child(hb); @@ -163,6 +162,8 @@ EditorLog::EditorLog() { current = Thread::get_caller_id(); + add_constant_override("separation", get_constant("separation", "VBoxContainer")); + EditorNode::get_undo_redo()->set_commit_notify_callback(_undo_redo_cbk, this); } |