bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: note that XDG_* environment variables can't be relied on

Browse Source 
This assumption caused #121241.

Also correct `endif` comment.
This commit is contained in:
Campbell Barton 2024-04-30 15:00:52 +10:00
parent e8de8ee85a
commit d06c34b2e5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_WindowWayland.cc
View File

@ -1928,7 +1928,7 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
wl_surface_commit(window_->wl.surface);
::close(fd);
}
# endif /* WITH_GHOST_WAYLAND_LIBDECOR */
# endif /* WITH_VULKAN_BACKEND */
while (!decor.initial_configure_seen) {
wl_display_flush(system->wl_display_get());

2
source/blender/blenlib/intern/fileops_c.cc
View File

@ -1204,6 +1204,8 @@ static int delete_soft(const char *file, const char **error_message)
const char *args[5];
const char *process_failed;
/* NOTE(@ideasman42): `XDG_*` environment variables aren't reliably set on GNOME, see: #121241.
* Take care using them, as a hint they're OK, but not guaranteed to be correct. */
const char *xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP");
const char *xdg_session_desktop = getenv("XDG_SESSION_DESKTOP");