godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91716 from dalexeev/editor-fix-help-bit-tooltip-and-progress-dialog-crash 

Editor: Fix `EditorHelpBitTooltip` + `ProgressDialog` causes crash
This commit is contained in:
Rémi Verschelde 2024-05-13 15:47:34 +02:00
parent 4fe9764ba9 18fca3c294
commit de196227e1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editor_help.cpp
View File

@ -3760,6 +3760,14 @@ EditorHelpBit::EditorHelpBit(const String &p_symbol) {
/// EditorHelpBitTooltip /// /// EditorHelpBitTooltip ///
void EditorHelpBitTooltip::_safe_queue_free() {
if (_pushing_input > 0) {
_need_free = true;
} else {
queue_free();
}
}
void EditorHelpBitTooltip::_notification(int p_what) { void EditorHelpBitTooltip::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_WM_MOUSE_ENTER: case NOTIFICATION_WM_MOUSE_ENTER:
@ -3778,7 +3786,13 @@ void EditorHelpBitTooltip::_input_from_window(const Ref<InputEvent> &p_event) {
} else { } else {
const Ref<InputEventMouse> mouse_event = p_event; const Ref<InputEventMouse> mouse_event = p_event;
if (mouse_event.is_null()) { if (mouse_event.is_null()) {
// GH-91652. Prevents use-after-free since `ProgressDialog` calls `Main::iteration()`.
_pushing_input++;
get_parent_viewport()->push_input(p_event); get_parent_viewport()->push_input(p_event);
_pushing_input--;
if (_pushing_input <= 0 && _need_free) {
queue_free();
}
} }
} }
} }
@ -3839,7 +3853,7 @@ EditorHelpBitTooltip::EditorHelpBitTooltip(Control *p_target) {
timer = memnew(Timer); timer = memnew(Timer);
timer->set_wait_time(0.2); timer->set_wait_time(0.2);
timer->connect("timeout", callable_mp(static_cast<Node *>(this), &Node::queue_free)); timer->connect("timeout", callable_mp(this, &EditorHelpBitTooltip::_safe_queue_free));
add_child(timer); add_child(timer);
ERR_FAIL_NULL(p_target); ERR_FAIL_NULL(p_target);

4
editor/editor_help.h
View File

@ -325,6 +325,10 @@ class EditorHelpBitTooltip : public PopupPanel {
GDCLASS(EditorHelpBitTooltip, PopupPanel); GDCLASS(EditorHelpBitTooltip, PopupPanel);
Timer *timer = nullptr; Timer *timer = nullptr;
int _pushing_input = 0;
bool _need_free = false;
void _safe_queue_free();
protected: protected:
void _notification(int p_what); void _notification(int p_what);