summaryrefslogtreecommitdiffstats
path: root/x11vnc/8to24.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2009-05-21 10:57:03 -0400
committerrunge <runge@karlrunge.com>2009-05-21 10:57:03 -0400
commit94d058b35f075cec2d6e8b6e37ee1a94086ea3f8 (patch)
tree6cec0620ab70b5db6b33645dbcac1071f3c7a556 /x11vnc/8to24.c
parent804335f9d296440bb708ca844f5d89b58b50b0c6 (diff)
downloadlibtdevnc-94d058b3.tar.gz
libtdevnc-94d058b3.zip
Thread safety. Fix -clip -in -rawfb. Try to avoid Xorg stuck
key bug.
Diffstat (limited to 'x11vnc/8to24.c')
-rw-r--r--x11vnc/8to24.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/x11vnc/8to24.c b/x11vnc/8to24.c
index 7057234..d634cb1 100644
--- a/x11vnc/8to24.c
+++ b/x11vnc/8to24.c
@@ -941,6 +941,7 @@ if (db24 > 2) fprintf(stderr, "avoid bad match...\n");
xi_r = XGetSubImage(dpy, win, xo, yo, w, 1, AllPlanes, ZPixmap, xi,
0, 0);
XSetErrorHandler(old_handler);
+
X_UNLOCK;
if (! xi_r || trapped_xerror) {
@@ -1664,6 +1665,7 @@ if (db24 > 1) fprintf(stderr, "skipping due to potential bad match...\n");
ZPixmap, xi, 0, 0);
#endif
XSetErrorHandler(old_handler);
+
X_UNLOCK;
if (! xi_r || trapped_xerror) {
@@ -2100,7 +2102,7 @@ void mark_8bpp(int mode) {
}
if (windows_8bpp[i].map_state != IsViewable) {
XWindowAttributes attr;
- int vw;
+ int vw = 0;
X_LOCK;
vw = valid_window(windows_8bpp[i].win, &attr, 1);