archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Fix crash when creating an off-screen context fails in Wayland

Browse Source 
This is very unlikely to happen but better not to crash.
This commit is contained in:
Campbell Barton
2022-07-01 15:33:18 +10:00
parent 650a15fb9b
commit b1d3b14711
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@@ -2789,14 +2789,18 @@ GHOST_IContext *GHOST_SystemWayland::createOffscreenContext(GHOST_GLSettings /*g
{
/* Create new off-screen window. */
wl_surface *wl_surface = wl_compositor_create_surface(compositor());
wl_egl_window *egl_window = wl_egl_window_create(wl_surface, int(1), int(1));
wl_egl_window *egl_window = wl_surface ? wl_egl_window_create(wl_surface, 1, 1) : nullptr;
GHOST_Context *context = createOffscreenContext_impl(this, d->display, egl_window);
if (!context) {
GHOST_PRINT("Cannot create off-screen EGL context" << std::endl);
wl_surface_destroy(wl_surface);
wl_egl_window_destroy(egl_window);
if (wl_surface) {
wl_surface_destroy(wl_surface);
}
if (egl_window) {
wl_egl_window_destroy(egl_window);
}
return nullptr;
}