[X2Go-Commits] [nx-libs] 14/54: Revert "Fix parsing ports set to unix sockets"

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit de421e4fe03013735f550255f082ebb58f339bd5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 20 10:40:20 2019 +0100

    Revert "Fix parsing ports set to unix sockets"
    
     This reverts commit 889de46f759913742478d2cfe20f1f4a6c2effdc.
    
     Fixes ArcticaProject/nx-libs#775.
---
 nxcomp/src/Loop.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 8e6f20e..ddffcd1 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;
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git