diff options
| author | runge <runge> | 2008-09-14 19:28:25 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-09-14 19:28:25 +0000 |
| commit | 95d7788eb062a6c6ba07bee516e4e8f1cc8a4db4 (patch) | |
| tree | 37da2bfec58413d02c9fbe59f86e848bf0fec348 /x11vnc/userinput.c | |
| parent | d5cba7a574a667f5321194cb05d0b4adcb995866 (diff) | |
| download | libtdevnc-95d7788eb062a6c6ba07bee516e4e8f1cc8a4db4.tar.gz libtdevnc-95d7788eb062a6c6ba07bee516e4e8f1cc8a4db4.zip | |
x11vnc: -sleepin m-n for random sleep. More mktemp and mkstemp
protections. SSL_INIT_TIMEOUT=n env. var. Fix macosx console
X call bug. Synchronize other projects sources.
Diffstat (limited to 'x11vnc/userinput.c')
| -rw-r--r-- | x11vnc/userinput.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/x11vnc/userinput.c b/x11vnc/userinput.c index 37783d0..5ab6c2d 100644 --- a/x11vnc/userinput.c +++ b/x11vnc/userinput.c @@ -7656,6 +7656,10 @@ void xselectinput(Window w, unsigned long evmask, int sync) { XErrorHandler old_handler1; XIOErrorHandler old_handler2; + if (macosx_console || !dpy) { + return; + } + old_handler1 = XSetErrorHandler(trap_xerror); old_handler2 = XSetIOErrorHandler(trap_xioerror); trapped_xerror = 0; @@ -8812,7 +8816,7 @@ if (ncdb) fprintf(stderr, "*VIS BS_save: 0x%lx %d %d %d\n", win, cache_list[i]. last_sched_bs = dnow(); } #if !NO_X11 - if (atom_XROOTPMAP_ID == None && now > last_pixmap + 5.0) { + if (dpy && atom_XROOTPMAP_ID == None && now > last_pixmap + 5.0) { atom_XROOTPMAP_ID = XInternAtom(dpy, "_XROOTPMAP_ID", True); last_pixmap = now; } |