From 91e1fe5863a180b2d70a6943e83b98bbd4c9ebce Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Mon, 21 Sep 2009 19:13:31 +0200 Subject: [PATCH] Revert fe31f9c + 977953b to fix issue for good. Signed-off-by: Peter Hutterer --- hw/xfree86/modes/xf86Cursors.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 3d2d63337..fc4df8477 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -480,14 +480,8 @@ xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - if (xf86_config->cursor) { - /* Under some circumstances an already set cursor is set again. - * If the pointer is freed, ->bits is killed */ - if (xf86_config->cursor != cursor) - FreeCursor (xf86_config->cursor, None); - else - --cursor->refcnt; - } + if (xf86_config->cursor) + FreeCursor (xf86_config->cursor, None); xf86_config->cursor = cursor; ++cursor->refcnt;