hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #116724 from mihe/embedded-editor-crash-fix

Browse source 
macOS: Add `nullptr` checks of `script_debugger` in `LayerHost::gui_input`
This commit is contained in:
Rémi Verschelde 2026-03-02 12:35:42 +01:00
commit d3e5ba0d6b
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platform/macos/editor/embedded_process_macos.mm
View file

@ -336,7 +336,9 @@ void LayerHost::gui_input(const Ref<InputEvent> &p_event) {
DisplayServer *ds = DisplayServer::get_singleton();
if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
script_debugger->send_message("embed:mouse_set_mode", { DisplayServer::MOUSE_MODE_VISIBLE });
if (script_debugger != nullptr) {
script_debugger->send_message("embed:mouse_set_mode", { DisplayServer::MOUSE_MODE_VISIBLE });
}
}
accept_event();
return;
@ -352,7 +354,9 @@ void LayerHost::gui_input(const Ref<InputEvent> &p_event) {
PackedByteArray data;
if (encode_input_event(p_event, data)) {
script_debugger->send_message("embed:event", { data });
if (script_debugger != nullptr) {
script_debugger->send_message("embed:event", { data });
}
accept_event();
}
}