From d5a5dd52e82c171a3eba449cfdee9eb3be1323d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Fri, 5 Jan 2024 18:27:10 +0100 Subject: Avoid several null-dereferences of ApiContextRD --- platform/ios/display_server_ios.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'platform/ios') diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index c31f503605..16299d0450 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -87,17 +87,19 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode if (context_rd) { if (context_rd->initialize() != OK) { + ERR_PRINT(vformat("Failed to initialize %s context", context_rd->get_api_name())); memdelete(context_rd); context_rd = nullptr; - ERR_FAIL_MSG(vformat("Failed to initialize %s context", context_rd->get_api_name())); + return; } Size2i size = Size2i(layer.bounds.size.width, layer.bounds.size.height) * screen_get_max_scale(); if (context_rd->window_create(MAIN_WINDOW_ID, p_vsync_mode, size.width, size.height, &wpd) != OK) { + ERR_PRINT(vformat("Failed to create %s window.", context_rd->get_api_name())); memdelete(context_rd); context_rd = nullptr; r_error = ERR_UNAVAILABLE; - ERR_FAIL_MSG(vformat("Failed to create %s window.", context_rd->get_api_name())); + return; } rendering_device = memnew(RenderingDevice); -- cgit v1.2.3