diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:32 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:32 +0200 |
commit | 01ed75712979168d0355bd594a741c02a088685c (patch) | |
tree | 86b201be89e6f14d2ab1936a711fc76f55a1ee85 /nx-X11/lib | |
parent | 30463b084b2833193aa6fdc2ceafefc8a1c06fee (diff) | |
download | nx-libs-01ed75712979168d0355bd594a741c02a088685c.tar.gz nx-libs-01ed75712979168d0355bd594a741c02a088685c.tar.bz2 nx-libs-01ed75712979168d0355bd594a741c02a088685c.zip |
Imported nx-X11-3.3.0-3.tar.gznx-X11/3.3.0-3
Summary: Imported nx-X11-3.3.0-3.tar.gz
Keywords:
Imported nx-X11-3.3.0-3.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/lib')
-rw-r--r-- | nx-X11/lib/X11/XlibInt.c | 13 | ||||
-rw-r--r-- | nx-X11/lib/X11/XlibInt.c.NX.original | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index d440d663d..9a8ac4b73 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -1840,7 +1840,20 @@ _XSend ( int congestion; #endif +#ifdef AGENT_SERVER + if (!size || (dpy->flags & XlibDisplayIOError)) + { + if (dpy->flags & XlibDisplayIOError) + { + dpy->bufptr = dpy->buffer; + dpy->last_req = (char *)&_dummy_request; + } + + return; + } +#else if (!size || (dpy->flags & XlibDisplayIOError)) return; +#endif dbufsize = dpy->bufptr - dpy->buffer; #ifdef XTHREADS dpy->flags |= XlibDisplayWriting; diff --git a/nx-X11/lib/X11/XlibInt.c.NX.original b/nx-X11/lib/X11/XlibInt.c.NX.original index d440d663d..9a8ac4b73 100644 --- a/nx-X11/lib/X11/XlibInt.c.NX.original +++ b/nx-X11/lib/X11/XlibInt.c.NX.original @@ -1840,7 +1840,20 @@ _XSend ( int congestion; #endif +#ifdef AGENT_SERVER + if (!size || (dpy->flags & XlibDisplayIOError)) + { + if (dpy->flags & XlibDisplayIOError) + { + dpy->bufptr = dpy->buffer; + dpy->last_req = (char *)&_dummy_request; + } + + return; + } +#else if (!size || (dpy->flags & XlibDisplayIOError)) return; +#endif dbufsize = dpy->bufptr - dpy->buffer; #ifdef XTHREADS dpy->flags |= XlibDisplayWriting; |