diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
| commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
| tree | afbeb028495328a2817aedbac7aae484a2c71a83 /xorg-server/os/utils.c | |
| parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
| parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
| download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'xorg-server/os/utils.c')
| -rw-r--r-- | xorg-server/os/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index cbd5c7ad5..c514ae11a 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -290,7 +290,7 @@ LockServer(void) int len; char port[20]; - if (nolock) + if (nolock || NoListenAll) return; /* * Path names @@ -411,7 +411,7 @@ LockServer(void) void UnlockServer(void) { - if (nolock) + if (nolock || NoListenAll) return; if (!StillLocking) { |