summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/x11/meta-x11-display.c6
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)
{