aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Window.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-16 11:52:35 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-16 11:52:35 +0200
commitf24767b3ccfa3f659846f78f32dd13e49dfb1752 (patch)
tree8f82999da66759ac849a6744397300ec98cf3ee2 /nx-X11/programs/Xserver/hw/nxagent/Window.c
parent7f4b50deb5a41bc88227ce925ecbb3fe713705c2 (diff)
parent62573abf00fb6fd6fcc642088a570400d88197d0 (diff)
downloadnx-libs-f24767b3ccfa3f659846f78f32dd13e49dfb1752.tar.gz
nx-libs-f24767b3ccfa3f659846f78f32dd13e49dfb1752.tar.bz2
nx-libs-f24767b3ccfa3f659846f78f32dd13e49dfb1752.zip
Merge branch 'uli42-pr/improve_wait_events' into 3.6.x
Attributes GH PR #828: https://github.com/ArcticaProject/nx-libs/pull/828
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 7d390872e..1095d0797 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -849,7 +849,6 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
* Change to fullscreen mode.
*/
- struct timeval timeout;
int i;
XEvent e;
@@ -874,10 +873,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
XSync(nxagentDisplay, 0);
- timeout.tv_sec = 0;
- timeout.tv_usec = 50 * 1000;
-
- nxagentWaitEvents(nxagentDisplay, &timeout);
+ nxagentWaitEvents(nxagentDisplay, 50);
}
if (i < 100)