diff options
| author | Vadim <vtroshchinskiy@qindel.com> | 2019-01-18 13:15:18 +0100 |
|---|---|---|
| committer | Vadim <vtroshchinskiy@qindel.com> | 2019-01-22 11:59:33 +0100 |
| commit | 889de46f759913742478d2cfe20f1f4a6c2effdc (patch) | |
| tree | d94b76f7a2658051d16df5023b1c289922ccea8d /nxcomp/src | |
| parent | 5c99eb7d5d3121c4fff11e73b923a4c7a88263fc (diff) | |
| download | nx-libs-889de46f759913742478d2cfe20f1f4a6c2effdc.tar.gz nx-libs-889de46f759913742478d2cfe20f1f4a6c2effdc.tar.bz2 nx-libs-889de46f759913742478d2cfe20f1f4a6c2effdc.zip | |
Fix parsing ports set to unix sockets
Diffstat (limited to 'nxcomp/src')
| -rw-r--r-- | nxcomp/src/Loop.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index ddffcd1ca..8e6f20efb 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -7803,6 +7803,7 @@ int ParseEnvironmentOptions(const char *env, int force) strcpy(opts, env); char *nextOpts = opts; + bool nxdisplay_found = false; // // Ensure that DISPLAY environment variable @@ -7824,14 +7825,17 @@ 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) { @@ -7860,7 +7864,7 @@ int ParseEnvironmentOptions(const char *env, int force) value = strrchr(nextOpts, ':'); - if (value != NULL) + if (value != NULL && nxdisplay_found ) { char *check = value + 1; |