Browse Source

Added missing null checks for gl_manager in MacOS and Windows display servers

David Snopek 2 years ago
parent
commit
4c8409c0fe

+ 4 - 1
platform/macos/display_server_macos.mm

@@ -2945,7 +2945,10 @@ int64_t DisplayServerMacOS::window_get_native_handle(HandleType p_handle_type, W
 		}
 #ifdef GLES3_ENABLED
 		case OPENGL_CONTEXT: {
-			return (int64_t)gl_manager->get_context(p_window);
+			if (gl_manager) {
+				return (int64_t)gl_manager->get_context(p_window);
+			}
+			return 0;
 		}
 #endif
 		default: {

+ 8 - 2
platform/windows/display_server_windows.cpp

@@ -743,10 +743,16 @@ int64_t DisplayServerWindows::window_get_native_handle(HandleType p_handle_type,
 		}
 #if defined(GLES3_ENABLED)
 		case WINDOW_VIEW: {
-			return (int64_t)gl_manager->get_hdc(p_window);
+			if (gl_manager) {
+				return (int64_t)gl_manager->get_hdc(p_window);
+			}
+			return 0;
 		}
 		case OPENGL_CONTEXT: {
-			return (int64_t)gl_manager->get_hglrc(p_window);
+			if (gl_manager) {
+				return (int64_t)gl_manager->get_hglrc(p_window);
+			}
+			return 0;
 		}
 #endif
 		default: {