Merge pull request #102993 from bruvzg/fix_cb_win_erase

Prevent pending input event callbacks from erasing the window in the middle of a loop.
This commit is contained in:
Thaddeus Crews 2025-02-18 20:47:53 -06:00
commit e91493fb7b
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
3 changed files with 20 additions and 8 deletions

View file

@ -4253,13 +4253,17 @@ void DisplayServerWindows::_dispatch_input_event(const Ref<InputEvent> &p_event)
}
}
} else {
// Send to all windows.
for (const KeyValue<WindowID, WindowData> &E : windows) {
const Callable callable = E.value.input_event_callback;
// Send to all windows. Copy all pending callbacks, since callback can erase window.
Vector<Callable> cbs;
for (KeyValue<WindowID, WindowData> &E : windows) {
Callable callable = E.value.input_event_callback;
if (callable.is_valid()) {
callable.call(p_event);
cbs.push_back(callable);
}
}
for (const Callable &cb : cbs) {
cb.call(p_event);
}
}
in_dispatch_input_event = false;