diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-20 10:40:20 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-20 10:40:20 +0100 |
| commit | de421e4fe03013735f550255f082ebb58f339bd5 (patch) | |
| tree | 5546022ca7ec9b85888af6cb75722efe089fb5b6 | |
| parent | 3572b251eb21d310ad49e6bdab11e36018b67d7c (diff) | |
| download | nx-libs-de421e4fe03013735f550255f082ebb58f339bd5.tar.gz nx-libs-de421e4fe03013735f550255f082ebb58f339bd5.tar.bz2 nx-libs-de421e4fe03013735f550255f082ebb58f339bd5.zip | |
Revert "Fix parsing ports set to unix sockets"
This reverts commit 889de46f759913742478d2cfe20f1f4a6c2effdc.
Fixes ArcticaProject/nx-libs#775.
| -rw-r--r-- | nxcomp/src/Loop.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 8e6f20efb..ddffcd1ca 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -7803,7 +7803,6 @@ int ParseEnvironmentOptions(const char *env, int force) strcpy(opts, env); char *nextOpts = opts; - bool nxdisplay_found = false; // // Ensure that DISPLAY environment variable @@ -7825,17 +7824,14 @@ int ParseEnvironmentOptions(const char *env, int force) else if (strncasecmp(opts, "nx/nx,", 6) == 0) { nextOpts += 6; - nxdisplay_found = true; } else if (strncasecmp(opts, "nx,", 3) == 0) { nextOpts += 3; - nxdisplay_found = true; } else if (strncasecmp(opts, "nx:", 3) == 0) { nextOpts += 3; - nxdisplay_found = true; } else if (force == 0) { @@ -7864,7 +7860,7 @@ int ParseEnvironmentOptions(const char *env, int force) value = strrchr(nextOpts, ':'); - if (value != NULL && nxdisplay_found ) + if (value != NULL) { char *check = value + 1; |