diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
| commit | f586b49ae23c573681b939ca44b3f418c83c84b2 (patch) | |
| tree | ffafe2da4517c5121ab4a8c64966e72829147215 /xorg-server/hw/xwin/wincmap.c | |
| parent | 728ff03357b2dfd7048ab093183a239a0ba044c4 (diff) | |
| parent | 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 (diff) | |
| download | vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.gz vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.bz2 vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.zip | |
svn merge "^/branches/released" .
Solved mouse motion bug in new version of dix/getevents.c
Diffstat (limited to 'xorg-server/hw/xwin/wincmap.c')
| -rw-r--r-- | xorg-server/hw/xwin/wincmap.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c index 370a4c584..83279fd84 100644 --- a/xorg-server/hw/xwin/wincmap.c +++ b/xorg-server/hw/xwin/wincmap.c @@ -494,11 +494,8 @@ winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap) pScreen->blackPixel = 0;
/* Free colormap */
- if (ppeColors != NULL)
- {
- free (ppeColors);
- ppeColors = NULL;
- }
+ free(ppeColors);
+ ppeColors = NULL;
/* Free the DC */
if (hdc != NULL)
|