summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hopf <mhopf@suse.de>2009-09-21 19:13:31 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-22 11:38:17 +1000
commit91e1fe5863a180b2d70a6943e83b98bbd4c9ebce (patch)
tree79ef362a93ae7a58c1205969f563398445ee4c5d
parent90aa0e4a49cdd637178a771365e1e8dab8bceb87 (diff)
Revert fe31f9c + 977953b to fix issue for good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/xfree86/modes/xf86Cursors.c10
1 files 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;