diff options
| author | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
| commit | 1f1e803140ea96b81ac4700a6759a9617d0f2fd2 (patch) | |
| tree | e9d2761170ec2461f178a595482507700879deee /xorg/server/module/rdpGlyphs.c | |
| parent | 80204e2536327f46610d5925c552aff235e9f447 (diff) | |
| parent | 0b18909f269ee582ec22bb808839c4434a0da3e7 (diff) | |
| download | xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.tar.gz xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.zip | |
Merge ../../neutrinolabs/xrdp into fastpath
Conflicts:
libxrdp/libxrdp.c
libxrdp/libxrdp.h
libxrdp/xrdp_iso.c
libxrdp/xrdp_sec.c
libxrdp/xrdp_tcp.c
xrdp/xrdp.ini
Diffstat (limited to 'xorg/server/module/rdpGlyphs.c')
| -rw-r--r-- | xorg/server/module/rdpGlyphs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg/server/module/rdpGlyphs.c b/xorg/server/module/rdpGlyphs.c index a4e93e47..e6fcbb30 100644 --- a/xorg/server/module/rdpGlyphs.c +++ b/xorg/server/module/rdpGlyphs.c @@ -96,7 +96,7 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictureScreenPtr ps; LLOGLN(10, ("rdpGlyphs:")); - pScreen = pSrc->pDrawable->pScreen; + pScreen = pDst->pDrawable->pScreen; dev = rdpGetDevFromScreen(pScreen); ps = GetPictureScreen(pScreen); rdpGlyphsOrg(ps, dev, op, pSrc, pDst, maskFormat, xSrc, ySrc, |