diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-12-08 14:43:55 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-12-08 14:43:55 +0000 |
| commit | b9734db4fdebe87f1b26e252738bdf1def5c5d33 (patch) | |
| tree | 82522bac784e2f0cc960db737085ee60b8a01002 /unix | |
| parent | 1e3c6645d3cf547c841163c254fe8260e5250964 (diff) | |
| download | tigervnc-b9734db4fdebe87f1b26e252738bdf1def5c5d33.tar.gz tigervnc-b9734db4fdebe87f1b26e252738bdf1def5c5d33.zip | |
[Bugfix] Don't hook pixmaps in vncHooks, it fixes crash after XDrawArc call.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4220 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/vncHooks.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc index c9a9abf9..1f928505 100644 --- a/unix/xserver/hw/vnc/vncHooks.cc +++ b/unix/xserver/hw/vnc/vncHooks.cc @@ -625,7 +625,7 @@ public: }; -// ValidateGC - wrap the "ops" if a drawable window or pixmap +// ValidateGC - wrap the "ops" if a viewable window static void vncHooksValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) @@ -637,7 +637,7 @@ static void vncHooksValidateGC(GCPtr pGC, unsigned long changes, (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable); u.vncHooksGC->wrappedOps = 0; - if (pDrawable->type == DRAWABLE_WINDOW || pDrawable->type == DRAWABLE_PIXMAP) { + if (pDrawable->type == DRAWABLE_WINDOW && ((WindowPtr) pDrawable)->viewable) { u.vncHooksGC->wrappedOps = pGC->ops; DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n")); } |