asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash when tooltip_request_func object is freed

Browse source
This commit is contained in:
Haoyu Qiu 2021-10-06 14:32:19 +08:00
parent 322387b694
commit 52a840b9c9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/text_edit.cpp
View file

@ -6801,6 +6801,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {
} }
String TextEdit::get_tooltip(const Point2 &p_pos) const { String TextEdit::get_tooltip(const Point2 &p_pos) const {
Object *tooltip_obj = ObjectDB::get_instance(tooltip_obj_id);
if (!tooltip_obj) { if (!tooltip_obj) {
return Control::get_tooltip(p_pos); return Control::get_tooltip(p_pos);
} }
@ -6822,7 +6823,8 @@ String TextEdit::get_tooltip(const Point2 &p_pos) const {
} }
void TextEdit::set_tooltip_request_func(Object *p_obj, const StringName &p_function, const Variant &p_udata) { void TextEdit::set_tooltip_request_func(Object *p_obj, const StringName &p_function, const Variant &p_udata) {
tooltip_obj = p_obj; ERR_FAIL_NULL(p_obj);
tooltip_obj_id = p_obj->get_instance_id();
tooltip_func = p_function; tooltip_func = p_function;
tooltip_ud = p_udata; tooltip_ud = p_udata;
} }
@ -7368,7 +7370,7 @@ TextEdit::TextEdit() {
completion_enabled = false; completion_enabled = false;
completion_active = false; completion_active = false;
completion_line_ofs = 0; completion_line_ofs = 0;
tooltip_obj = nullptr; tooltip_obj_id = ObjectID();
line_numbers = false; line_numbers = false;
line_numbers_zero_padded = false; line_numbers_zero_padded = false;
line_length_guidelines = false; line_length_guidelines = false;

2
scene/gui/text_edit.h
View file

@ -412,7 +412,7 @@ private:
VScrollBar *v_scroll; VScrollBar *v_scroll;
bool updating_scrolls; bool updating_scrolls;
Object *tooltip_obj; ObjectID tooltip_obj_id;
StringName tooltip_func; StringName tooltip_func;
Variant tooltip_ud; Variant tooltip_ud;