summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-07-06 09:31:08 +0200
committerGitHub <noreply@github.com>2022-07-06 09:31:08 +0200
commit398ab31a6bcf1a80a6fc13a56e2f7f8558303d51 (patch)
treec7ef88b1884c5896c92e6c57fc1eb4aa8224210a /platform/windows
parent83ad1231a7d3e4c8a7eda97229fa409df263d2e6 (diff)
parenta194043ea81bcc1aa1d431834327ffa778d561bb (diff)
Merge pull request #62767 from bruvzg/glman_check
Check if GL manager exist to prevent crash when using multithreaded renderer with Vulkan.
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/display_server_windows.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 03d0d0e0bd..e66fa142a7 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -656,7 +656,9 @@ void DisplayServerWindows::delete_sub_window(WindowID p_window) {
void DisplayServerWindows::gl_window_make_current(DisplayServer::WindowID p_window_id) {
#if defined(GLES3_ENABLED)
- gl_manager->window_make_current(p_window_id);
+ if (gl_manager) {
+ gl_manager->window_make_current(p_window_id);
+ }
#endif
}