diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-07 10:32:28 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-07 10:32:28 +0200 |
commit | dcdbc102c1d1827fd10959148d52f9e2e96bf3cd (patch) | |
tree | ad80fa3280e59a4787e3aa2a879ced0b0d8993a6 /nx-X11/programs/Xserver/hw/nxagent/Render.c | |
parent | c8a4e1e75c745c5c3ad947ba61c52cc5963d31dd (diff) | |
parent | 6c8c950258cf0da0cf24c5e80c2216914ac282a4 (diff) | |
download | nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.tar.gz nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.tar.bz2 nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.zip |
Merge branch 'sunweaver-pr/drop-render-fullcolor-workaround' into 3.6.x
Attributes GH PR #401: https://github.com/ArcticaProject/nx-libs/pull/401
Reviewed by: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> -- Fri, 07 Apr 2017 10:24:05 +0200
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 7ce204c3c..3193e01f5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -2662,17 +2662,11 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2) #endif } - if (!pForm && pPicture->pSourcePict) - { - /*possible we need to add support for other picture types, for example gradients...*/ - switch(pPicture->pSourcePict->type) - { - case SourcePictTypeSolidFill: - nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay, - (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor); - break; - } - return; + if (!pForm) + { + *pBool = False; + + return; } #ifdef TEST |