From 9214cd879af29b32b4f8692bc050f38e7c8c5ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?=
 <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 10:28:37 +0300
Subject: [PATCH] [macOS] Fix keyboard mapping init in embedded display server.

---
 platform/macos/display_server_macos.mm      | 2 --
 platform/macos/display_server_macos_base.mm | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
index 7eac6cdd0e4..376fdeed31d 100644
--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@@ -3721,8 +3721,6 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
 }
 
 DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
-	KeyMappingMacOS::initialize();
-
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
 
 	r_error = OK;
diff --git a/platform/macos/display_server_macos_base.mm b/platform/macos/display_server_macos_base.mm
index ba15250beee..15d123b44fd 100644
--- a/platform/macos/display_server_macos_base.mm
+++ b/platform/macos/display_server_macos_base.mm
@@ -302,6 +302,8 @@ void DisplayServerMacOSBase::show_emoji_and_symbol_picker() const {
 }
 
 DisplayServerMacOSBase::DisplayServerMacOSBase() {
+	KeyMappingMacOS::initialize();
+
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {