aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/modes
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-14 12:29:39 +0000
committermarha <marha@users.sourceforge.net>2010-06-14 12:29:39 +0000
commit0cf9b03f4990f61640dc35dfac250f929b57b4ed (patch)
treef4a96a254237696f58d46c150c12f289e5a15701 /xorg-server/hw/xfree86/modes
parentea5824c767121c3c97f587a9dfb63a87b442032b (diff)
downloadvcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.gz
vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.bz2
vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.zip
xserver git update 14/6/2010
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
-rw-r--r--xorg-server/hw/xfree86/modes/xf86Cursors.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index e9770f8b9..4cf6147bb 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -659,11 +659,8 @@ xf86_cursors_fini (ScreenPtr screen)
xf86DestroyCursorInfoRec (xf86_config->cursor_info);
xf86_config->cursor_info = NULL;
}
- if (xf86_config->cursor_image)
- {
- free(xf86_config->cursor_image);
- xf86_config->cursor_image = NULL;
- }
+ free(xf86_config->cursor_image);
+ xf86_config->cursor_image = NULL;
if (xf86_config->cursor)
{
FreeCursor (xf86_config->cursor, None);