diff options
| author | David Snopek <dsnopek@gmail.com> | 2022-11-13 07:06:26 -0600 |
|---|---|---|
| committer | David Snopek <dsnopek@gmail.com> | 2022-11-13 07:06:26 -0600 |
| commit | 4c8409c0fe2a06dd7fa0ff0fde428298b4b18e2d (patch) | |
| tree | b81c6d3aac377ccefbfcc8c681f95612ec82db4c | |
| parent | c17f17eb98188a7134c85bdbdf0123127c462046 (diff) | |
Added missing null checks for gl_manager in MacOS and Windows display servers
| -rw-r--r-- | platform/macos/display_server_macos.mm | 5 | ||||
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 8b596379a0..e8a56c984c 100644 --- a/platform/macos/display_server_macos.mm +++ b/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: { diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 2c8058fdc5..ec6a8d5579 100644 --- a/platform/windows/display_server_windows.cpp +++ b/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: { |