Skip to content

N
nx-libs
Unverified Commit 4214a719 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-pr/fix_xlibcrash' into 3.6.x

Attributes GH PR #754: https://github.com/ArcticaProject/nx-libs/pull/754
parents d9825596 633f4617
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
nx-X11/lib/src/XlibInt.c
View file @ 4214a719
...@@ -875,7 +875,7 @@ void _XSeqSyncFunction( ...@@ -875,7 +875,7 @@ void _XSeqSyncFunction(
if (dpy->flags & XlibDisplayIOError) if (dpy->flags & XlibDisplayIOError)
{ {
#ifdef NX_TRANS_DEBUG #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 #endif
return; return;
} }
...@@ -892,6 +892,16 @@ void _XSeqSyncFunction( ...@@ -892,6 +892,16 @@ void _XSeqSyncFunction(
static int static int
_XPrivSyncFunction (Display *dpy) _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 #ifdef XTHREADS
assert(!dpy->lock_fns); assert(!dpy->lock_fns);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment