diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/hw/xquartz/X11Controller.m | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xquartz/X11Controller.m')
| -rw-r--r-- | xorg-server/hw/xquartz/X11Controller.m | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m index d8d23ec2f..119154764 100644 --- a/xorg-server/hw/xquartz/X11Controller.m +++ b/xorg-server/hw/xquartz/X11Controller.m @@ -52,8 +52,6 @@ #include <sys/types.h> #include <sys/wait.h> -BOOL xquartz_resetenv_display = NO; - @implementation X11Controller - (void) awakeFromNib @@ -353,7 +351,7 @@ BOOL xquartz_resetenv_display = NO; newargv[3] = NULL; s = getenv("DISPLAY"); - if (xquartz_resetenv_display || s == NULL || s[0] == 0) { + if (s == NULL || s[0] == 0) { snprintf(buf, sizeof(buf), ":%s", display); setenv("DISPLAY", buf, TRUE); } |