diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-22 22:02:15 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-22 22:02:15 +0100 |
| commit | 4214a719a0c0564e7c4ced565e0a28ecdcc7f2d7 (patch) | |
| tree | 4b22440771d177198b9591434b550c930e0eafc5 /nx-X11/lib/src | |
| parent | d98255968330e904e02cd129482f83f31e937fa6 (diff) | |
| parent | 633f4617b6720bcac8e0ead9e46fd14b60d598e6 (diff) | |
| download | nx-libs-4214a719a0c0564e7c4ced565e0a28ecdcc7f2d7.tar.gz nx-libs-4214a719a0c0564e7c4ced565e0a28ecdcc7f2d7.tar.bz2 nx-libs-4214a719a0c0564e7c4ced565e0a28ecdcc7f2d7.zip | |
Merge branch 'uli42-pr/fix_xlibcrash' into 3.6.x
Attributes GH PR #754: https://github.com/ArcticaProject/nx-libs/pull/754
Diffstat (limited to 'nx-X11/lib/src')
| -rw-r--r-- | nx-X11/lib/src/XlibInt.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nx-X11/lib/src/XlibInt.c b/nx-X11/lib/src/XlibInt.c index 119126d3d..36e650193 100644 --- a/nx-X11/lib/src/XlibInt.c +++ b/nx-X11/lib/src/XlibInt.c @@ -875,7 +875,7 @@ void _XSeqSyncFunction( if (dpy->flags & XlibDisplayIOError) { #ifdef NX_TRANS_DEBUG - fprintf(stderr, "_XSeqSyncFunction: Returning 0 with I/O error detected.\n"); + fprintf(stderr, "_XSeqSyncFunction: Returning with I/O error detected.\n"); #endif return; } @@ -892,6 +892,16 @@ void _XSeqSyncFunction( static int _XPrivSyncFunction (Display *dpy) { +#ifdef NX_TRANS_SOCKET + if (dpy->flags & XlibDisplayIOError) + { +#ifdef NX_TRANS_DEBUG + fprintf(stderr, "%s: Returning 0 with I/O error detected.\n", __func__); +#endif + return 0; + } +#endif /* NX_TRANS_SOCKET */ + #ifdef XTHREADS assert(!dpy->lock_fns); #endif |