diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2021-02-27 10:27:36 +0300 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2021-02-27 09:16:49 +0000 |
| commit | 861d03aac06db0666a207e8daa7951ddf21b2849 (patch) | |
| tree | e714e6e6c76cf3e98e8b8d500f713de6ce62c52c /src/x11/meta-x11-display.c | |
| parent | 2a71ca373bf9d2b4902e447a0b53d72432688c58 (diff) | |
| download | mutter-861d03aac06db0666a207e8daa7951ddf21b2849.tar.gz | |
x11-display: Use unsetenv if old value was NULL
Gets rid of a CRITICAL if NO_AT_BRIDGE was not set before.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1749>
Diffstat (limited to 'src/x11/meta-x11-display.c')
| -rw-r--r-- | src/x11/meta-x11-display.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index e25e3a368..88c8f4931 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -1086,7 +1086,11 @@ meta_x11_init_gdk_display (GError **error) old_no_at_bridge = g_getenv ("NO_AT_BRIDGE"); g_setenv ("NO_AT_BRIDGE", "1", TRUE); gdk_display = gdk_display_open (xdisplay_name); - g_setenv ("NO_AT_BRIDGE", old_no_at_bridge, TRUE); + + if (old_no_at_bridge) + g_setenv ("NO_AT_BRIDGE", old_no_at_bridge, TRUE); + else + g_unsetenv ("NO_AT_BRIDGE"); if (!gdk_display) { |