diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
| commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
| tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /xorg-server/randr/rrprovider.c | |
| parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'xorg-server/randr/rrprovider.c')
| -rw-r--r-- | xorg-server/randr/rrprovider.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c index 14d2d3db3..3f3c008c5 100644 --- a/xorg-server/randr/rrprovider.c +++ b/xorg-server/randr/rrprovider.c @@ -389,6 +389,8 @@ RRProviderDestroyResource (pointer value, XID pid) { rrScrPriv(pScreen); + if (pScrPriv->rrProviderDestroy) + (*pScrPriv->rrProviderDestroy)(pScreen, provider); pScrPriv->provider = NULL; } free(provider); |