diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-05 15:53:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-05 15:53:43 +0200 |
| commit | 50fad5cd2be4cd105c99687e224da60233f81645 (patch) | |
| tree | 37953f7b833a0ee31628e1301bb04be16238e6e2 /xorg-server/dix | |
| parent | 67c4614f29188e4af86e1d88ee82759c896b70b5 (diff) | |
| download | vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.tar.gz vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.tar.bz2 vcxsrv-50fad5cd2be4cd105c99687e224da60233f81645.zip | |
xserver mesa git update 4 sep 2012
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/dispatch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 3c6a591db..0ce10c2f7 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@ -3904,6 +3904,10 @@ RemoveGPUScreen(ScreenPtr pScreen) } screenInfo.numGPUScreens--; + /* this gets freed later in the resource list, but without + * the screen existing it causes crashes - so remove it here */ + if (pScreen->defColormap) + FreeResource(pScreen->defColormap, RT_COLORMAP); free(pScreen); } |