aboutsummaryrefslogtreecommitdiff
path: root/doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:16:00 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:16:00 +0200
commitd14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch)
tree28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original
parent74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff)
downloadnx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz
nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2
nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original')
-rw-r--r--doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original b/doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original
new file mode 100644
index 000000000..6620d4baa
--- /dev/null
+++ b/doc/_attic_/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_MaskEvent.c.X.original
@@ -0,0 +1,13 @@
+--- ./nx-X11/lib/X11/MaskEvent.c.X.original 2015-02-13 14:03:44.620443950 +0100
++++ ./nx-X11/lib/X11/MaskEvent.c 2015-02-10 19:13:12.944718089 +0100
+@@ -75,5 +75,10 @@
+ if (prev && prev->qserial_num != qe_serial)
+ /* another thread has snatched this event */
+ prev = NULL;
++#ifdef NX_TRANS_SOCKET
++ if (_XGetIOError(dpy)) {
++ return 0;
++ }
++#endif
+ }
+ }