diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:50:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:50:51 +0200 |
| commit | fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (patch) | |
| tree | 316ac30721a364e72b4fddf9e3a21ceb81ef7547 /nx-X11/programs/Xserver/hw/nxagent/Handlers.c | |
| parent | fe72988fb668ad97fc4fcb2ee3862613324d9516 (diff) | |
| parent | 222a4a22214608b7f89691eee1c57873c2631705 (diff) | |
| download | nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.gz nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.bz2 nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.zip | |
Merge branch 'nxagent'
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Handlers.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 310b572cc..332816fe0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -159,6 +159,8 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 }; * for our clients or the X server. */ +extern int nxagentSkipImage; + void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) { /* @@ -357,7 +359,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) nxagentCorruptedBackgrounds > 0 || nxagentCorruptedPixmaps > 0)); - if (synchronize == 1) + if (nxagentSkipImage == 0 && synchronize == 1) { #ifdef TEST fprintf(stderr, "nxagentBlockHandler: Setting a zero timeout with [%d][%d][%d] and " |