diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
| commit | 9b94209f53782ecaf7084722ce90836573ceb86b (patch) | |
| tree | 42354553aeeb29d9490a3120f0c5cd687cbad370 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | |
| parent | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff) | |
| parent | 16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff) | |
| download | nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2 nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip | |
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index cd57182a1..77da4c765 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -550,7 +550,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio nxagentFreeTimeoutTimer(); /* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */ - if ((dispatchException & DE_RESET) && + if ((dispatchException & DE_RESET) && (serverGeneration > nxagentMaxAllowedResets)) { dispatchException &= ~DE_RESET; @@ -568,7 +568,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio * error on the display and wait until the * NX transport is gone. */ - + fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString()); saveAgentState("TERMINATING"); |