Ensure joy_connection_changed is emitted on the main thread

(cherry picked from commit 1bb73b0)
godotengine · Aug 28, 2023 · d0d2680 · d0d2680
1 parent 5c80d42
commit d0d2680
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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_