Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-04-29 10:06:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] don't override SDL_VIDEODRIVER if it is already set

Browse Source
This commit is contained in:
Geoffrey McRae 2019-06-19 09:01:28 +10:00
parent 607539a2af
commit 2def6346e6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-rc5-10-g75de895b62+1 B1-rc6-0-g607539a2af+1

13
client/src/main.c
View File

@ -1014,13 +1014,16 @@ int run()
if (strcmp(XDG_SESSION_TYPE, "wayland") == 0) if (strcmp(XDG_SESSION_TYPE, "wayland") == 0)
{ {
DEBUG_INFO("Wayland detected"); DEBUG_INFO("Wayland detected");
int err = setenv("SDL_VIDEODRIVER", "wayland", 1); if (getenv("SDL_VIDEO_DRIVER") == NULL)
if (err < 0)
{ {
DEBUG_ERROR("Unable to set the env variable SDL_VIDEODRIVER: %d", err); int err = setenv("SDL_VIDEODRIVER", "wayland", 1);
return -1; if (err < 0)
{
DEBUG_ERROR("Unable to set the env variable SDL_VIDEODRIVER: %d", err);
return -1;
}
DEBUG_INFO("SDL_VIDEODRIVER has been set to wayland");
} }
DEBUG_INFO("SDL_VIDEODRIVER has been set to wayland");
} }
// warn about using FPS display until we can fix the font rendering to prevent lag spikes // warn about using FPS display until we can fix the font rendering to prevent lag spikes