diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-16 11:52:35 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-16 11:52:35 +0200 |
| commit | f24767b3ccfa3f659846f78f32dd13e49dfb1752 (patch) | |
| tree | 8f82999da66759ac849a6744397300ec98cf3ee2 /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
| parent | 7f4b50deb5a41bc88227ce925ecbb3fe713705c2 (diff) | |
| parent | 62573abf00fb6fd6fcc642088a570400d88197d0 (diff) | |
| download | nx-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/Screen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index d1dc37dc2..5cdb50f90 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -365,7 +365,6 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after for (int i = 0; i < 100 && nxagentWMIsRunning; i++) { - struct timeval timeout; XEvent e; #ifdef TEST @@ -379,10 +378,7 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after XSync(nxagentDisplay, 0); - timeout.tv_sec = 0; - timeout.tv_usec = 50 * 1000; - - nxagentWaitEvents(nxagentDisplay, &timeout); + nxagentWaitEvents(nxagentDisplay, 50); } } else |