From 2de7d5478bf34bcaa2ac4db96356fac284f6049d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Mon, 2 Mar 2026 16:15:22 +0200 Subject: [PATCH] Fix accessibility server init fallback. --- main/main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index a2983cae0b..e6642bd51c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -3293,12 +3293,12 @@ Error Main::setup2(bool p_show_boot_logo) { if (err != OK || accessibility_server == nullptr) { String last_name = AccessibilityServer::get_create_function_name(accessibility_driver_idx); - for (int i = 0; i < AccessibilityServer::get_create_function_count() - 1; i++) { + for (int i = 0; i < AccessibilityServer::get_create_function_count(); i++) { if (i == accessibility_driver_idx) { continue; // Don't try the same twice. } String name = AccessibilityServer::get_create_function_name(i); - WARN_PRINT(vformat("Accessibility driver %s failed, falling back to %s.", last_name, name)); + WARN_VERBOSE(vformat("Accessibility driver %s failed, falling back to %s.", last_name, name)); accessibility_server = AccessibilityServer::create(i, err); if (err == OK && accessibility_server != nullptr) { @@ -3306,9 +3306,7 @@ Error Main::setup2(bool p_show_boot_logo) { } } } - if (accessibility_server) { - accessibility_server->set_mode(accessibility_mode); - } + accessibility_server->set_mode(accessibility_mode); String rendering_driver = OS::get_singleton()->get_current_rendering_driver_name(); display_server = DisplayServer::create(display_driver_idx, rendering_driver, window_mode, window_vsync_mode, window_flags, window_position, window_size, init_screen, context, init_embed_parent_window_id, err);