diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-06-29 22:07:14 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-06-29 22:07:14 +0200 |
commit | a3d493a60de3c704b252775205bcafc3a175c853 (patch) | |
tree | 886e1d4134cdb61fdb4fedf1d0494e7b5fe5d273 /nx-X11/programs/Xserver/hw/nxagent/Handlers.c | |
parent | 4213bf46c117e5186aa404172c5439d92a5ace7f (diff) | |
parent | ede842c21cb73ce592ebb972fff9ca1ccd239a4e (diff) | |
download | nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.tar.gz nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.tar.bz2 nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.zip |
Merge branch 'uli42-pr/clarify_sleep' into 3.6.x
Attributs GH PR #930: https://github.com/ArcticaProject/nx-libs/pull/930
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Handlers.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 411dfe933..9f0a3c9d9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -235,18 +235,18 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) * display. */ - if (NXDisplayError(nxagentDisplay) == 1 && nxagentShadowCounter == 0 && nxagentOption(SleepTime) > 0) + if (NXDisplayError(nxagentDisplay) == 1 && nxagentShadowCounter == 0 && nxagentOption(SleepTimeMillis) > 0) { #ifdef TEST fprintf(stderr, "nxagentBlockHandler: sleeping for %d milliseconds for slowdown.\n", - nxagentOption(SleepTime)); + nxagentOption(SleepTimeMillis)); #endif - usleep(nxagentOption(SleepTime) * 1000); + usleep(nxagentOption(SleepTimeMillis) * 1000); now = GetTimeInMillis(); } #ifdef TEST - else if (0 == nxagentOption(SleepTime)) { + else if (0 == nxagentOption(SleepTimeMillis)) { fprintf(stderr, "nxagentBlockHandler: not sleeping for slowdown.\n"); } #endif @@ -708,16 +708,16 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas nxagentHandleConnectionChanges(); } - if (nxagentSessionState == SESSION_DOWN && nxagentOption(SleepTime) > 0) + if (nxagentSessionState == SESSION_DOWN && nxagentOption(SleepTimeMillis) > 0) { #ifdef TEST fprintf(stderr, "nxagentShadowBlockHandler: sleeping for %d milliseconds for slowdown.\n", - nxagentOption(SleepTime)); + nxagentOption(SleepTimeMillis)); #endif - usleep(nxagentOption(SleepTime) * 1000); + usleep(nxagentOption(SleepTimeMillis) * 1000); } #ifdef TEST - else if (0 == nxagentOption(SleepTime)) { + else if (0 == nxagentOption(SleepTimeMillis)) { fprintf(stderr, "nxagentShadowBlockHandler: not sleeping for slowdown.\n"); } #endif |