hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix accessibility server init fallback.

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2026-03-02 16:15:22 +02:00
parent 54c6cfee0d
commit 2de7d5478b
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/main.cpp
View file

@ -3293,12 +3293,12 @@ Error Main::setup2(bool p_show_boot_logo) {
if (err != OK || accessibility_server == nullptr) { if (err != OK || accessibility_server == nullptr) {
String last_name = AccessibilityServer::get_create_function_name(accessibility_driver_idx); 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) { if (i == accessibility_driver_idx) {
continue; // Don't try the same twice. continue; // Don't try the same twice.
} }
String name = AccessibilityServer::get_create_function_name(i); 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); accessibility_server = AccessibilityServer::create(i, err);
if (err == OK && accessibility_server != nullptr) { 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(); 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); 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);