From 5180116c0752163d6954abef61a873b32ae38f30 Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Sat, 11 Mar 2023 12:03:55 -0500 Subject: Fix null-pointer dereference on Android systems when using gl_compatibility renderer. (cherry picked from commit d186b7438f8ced5e79a7081a29e720d1683cd267) --- platform/android/display_server_android.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'platform') diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index af4ba1255b..e07e0e1149 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -676,16 +676,19 @@ void DisplayServerAndroid::cursor_set_custom_image(const Ref &p_cursor void DisplayServerAndroid::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) { #if defined(VULKAN_ENABLED) - context_vulkan->set_vsync_mode(p_window, p_vsync_mode); + if (context_vulkan) { + context_vulkan->set_vsync_mode(p_window, p_vsync_mode); + } #endif } DisplayServer::VSyncMode DisplayServerAndroid::window_get_vsync_mode(WindowID p_window) const { #if defined(VULKAN_ENABLED) - return context_vulkan->get_vsync_mode(p_window); -#else - return DisplayServer::VSYNC_ENABLED; + if (context_vulkan) { + return context_vulkan->get_vsync_mode(p_window); + } #endif + return DisplayServer::VSYNC_ENABLED; } void DisplayServerAndroid::reset_swap_buffers_flag() { -- cgit v1.2.3