diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-02-15 09:37:18 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2019-02-15 09:43:02 +0100 |
| commit | 586742b715a3e3451a4587439778c410a1970cdd (patch) | |
| tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | |
| parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
| download | nx-libs-586742b715a3e3451a4587439778c410a1970cdd.tar.gz nx-libs-586742b715a3e3451a4587439778c410a1970cdd.tar.bz2 nx-libs-586742b715a3e3451a4587439778c410a1970cdd.zip | |
Revert "nxagent: rework Bool handling"
This reverts commit 16cd2bbe1c4425e3fa557f9ca0723aa94a50b071.
It turned out that I had missed some of the Booleans being actually
tristate variables. I think I can fix this (they do not need to be
tristate) but I revert this for now to get back to a working state
(there are reports about non-working fullscreen mode and reconnect
problems).
Refers to ArcticaProject/nx-libs#772
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 279b73012..22d5f191e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -326,7 +326,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio clientReady[0] = 0; - if (nxagentSplashWindow != None || (nxagentOption(Xdmcp) && nxagentXdmcpUp == 0)) + if (nxagentSplashWindow != None || (nxagentOption(Xdmcp) == 1 && nxagentXdmcpUp == 0)) { #ifdef TEST fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n", @@ -339,7 +339,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio if (serverGeneration > nxagentMaxAllowedResets && nxagentSessionState == SESSION_STARTING && - (!nxagentOption(Xdmcp) || nxagentXdmcpUp == 1)) + (nxagentOption(Xdmcp) == 0 || nxagentXdmcpUp == 1)) { #ifdef NX_DEBUG_INPUT fprintf(stderr, "Session: Session started at '%s' timestamp [%lu].\n", @@ -568,7 +568,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio fprintf(stderr, "Session: Session terminated at '%s'.\n", GetTimeAsString()); } - if (nxagentOption(Shadow)) + if (nxagentOption(Shadow) == 1) { NXShadowDestroy(); } |