seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #113041 from ArchercatNEO/libdecor-conditional

Browse Source 
Wayland: Fix compiling with `libdecor=no`
This commit is contained in:
Thaddeus Crews
2025-11-24 10:21:21 -06:00
parent 3d0f2889d8 4dd5c83f72
commit 2250b317a8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/linuxbsd/wayland/display_server_wayland.cpp
View File

@ -1536,10 +1536,11 @@ Error DisplayServerWayland::embed_process(WindowID p_window, OS::ProcessID p_pid
ERR_FAIL_NULL_V(ws, ERR_BUG); ERR_FAIL_NULL_V(ws, ERR_BUG);
struct xdg_toplevel *toplevel = ws->xdg_toplevel; struct xdg_toplevel *toplevel = ws->xdg_toplevel;
#ifdef LIBDECOR_ENABLED
if (toplevel == nullptr && ws->libdecor_frame) { if (toplevel == nullptr && ws->libdecor_frame) {
toplevel = libdecor_frame_get_xdg_toplevel(ws->libdecor_frame); toplevel = libdecor_frame_get_xdg_toplevel(ws->libdecor_frame);
} }
#endif
ERR_FAIL_NULL_V(toplevel, ERR_CANT_CREATE); ERR_FAIL_NULL_V(toplevel, ERR_CANT_CREATE);