gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SDL_unsetenv()

Browse Source
This commit is contained in:
Sam Lantinga
2024-09-11 07:41:12 -07:00
parent 3166f91282
commit c77e51c084
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/unix/SDL_sysurl.c
View File

@@ -41,7 +41,7 @@ bool SDL_SYS_OpenURL(const char *url)
pid_t pid2; pid_t pid2;
const char *args[] = { "xdg-open", url, NULL }; const char *args[] = { "xdg-open", url, NULL };
// Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam // Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam
unsetenv("LD_PRELOAD"); SDL_unsetenv("LD_PRELOAD");
if (posix_spawnp(&pid2, args[0], NULL, NULL, (char **)args, environ) == 0) { if (posix_spawnp(&pid2, args[0], NULL, NULL, (char **)args, environ) == 0) {
// Child process doesn't wait for possibly-blocking grandchild. // Child process doesn't wait for possibly-blocking grandchild.
_exit(EXIT_SUCCESS); _exit(EXIT_SUCCESS);
@@ -51,7 +51,7 @@ bool SDL_SYS_OpenURL(const char *url)
#else #else
pid_t pid2; pid_t pid2;
// Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam // Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam
unsetenv("LD_PRELOAD"); SDL_unsetenv("LD_PRELOAD");
// Notice this is vfork and not fork! // Notice this is vfork and not fork!
pid2 = vfork(); pid2 = vfork();
if (pid2 == 0) { // Grandchild process will try to launch the url if (pid2 == 0) { // Grandchild process will try to launch the url

2
src/video/wayland/SDL_waylandwindow.c
View File

@@ -1926,7 +1926,7 @@ void Wayland_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
data->surface); data->surface);
// Clear this variable, per the protocol's request // Clear this variable, per the protocol's request
unsetenv("XDG_ACTIVATION_TOKEN"); SDL_unsetenv("XDG_ACTIVATION_TOKEN");
} }
} }