From 1bb73b0689a9cc2731eee63374f07e08b35b6e6a Mon Sep 17 00:00:00 2001 From: Ricardo Subtil Date: Tue, 8 Aug 2023 21:51:33 +0100 Subject: [PATCH] Ensure `joy_connection_changed` is emitted on the main thread --- core/input/input.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/input/input.cpp b/core/input/input.cpp index 4a32abfafa98..39f1acf6239a 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -475,7 +475,8 @@ void Input::joy_connection_changed(int p_idx, bool p_connected, String p_name, S } joy_names[p_idx] = js; - emit_signal(SNAME("joy_connection_changed"), p_idx, p_connected); + // Ensure this signal is emitted on the main thread, as some platforms (e.g. Linux) call this from a different thread. + call_deferred("emit_signal", SNAME("joy_connection_changed"), p_idx, p_connected); } Vector3 Input::get_gravity() const {