diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-05 13:02:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-05 13:02:30 +0100 |
| commit | b1c42dc98bea8b99eb8a2b1618421bdb698cf690 (patch) | |
| tree | 4425126f0e53713d613274f209494be9e51534d7 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | |
| parent | 995350d14335d8b5ef52dba47c7ae8d942901b10 (diff) | |
| parent | 7db6cff1cd9f4f7c7ae8b34866dd921bddf31642 (diff) | |
| download | nx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.tar.gz nx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.tar.bz2 nx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.zip | |
Merge branch 'uli42-pr/some_cleanups' into 3.6.x
Attributes GH PR #626: https://github.com/ArcticaProject/nx-libs/pull/626
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index ca7086d62..44b1033a3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -378,14 +378,14 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio * that the agent is ready. */ - if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch)) - { - nxagentRemoveSplashWindow(NULL); - } + if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch)) + { + nxagentRemoveSplashWindow(NULL); + } - nxagentClients = nClients; + nxagentClients = nClients; - #endif + #endif if (nready) { @@ -540,6 +540,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #if defined(DDXBEFORERESET) ddxBeforeReset (); #endif + /* FIXME: maybe move the code upto the KillAllClients() call to ddxBeforeReset? */ if ((dispatchException & DE_RESET) && (serverGeneration > nxagentMaxAllowedResets)) { |