From d0d26802450ea6504af3feb7fe3d209c9518887c 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 (cherry picked from commit 1bb73b0689a9cc2731eee63374f07e08b35b6e6a) --- main/input_default.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index 709f4b3cd23..215188a97be 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -298,8 +298,9 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_ }; joy_names[p_idx] = js; - emit_signal("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", "joy_connection_changed", p_idx, p_connected); +} Vector3 InputDefault::get_gravity() const { _THREAD_SAFE_METHOD_