summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-02 14:56:58 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-02 14:56:58 +0930
commit6f63724b28c8b3fd85314fb95d1e4f363b610e19 (patch)
treef44a75e28b1bc7ed3beec3588ca8e415f7c53e55
parent334456952930cb3e55c02fcdada2d0c074cd0520 (diff)
xfree86: don't try to repaint the cursor before cursors exist.
-rw-r--r--hw/xfree86/modes/xf86Cursors.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 42a4eaaf9..73a46635f 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -596,8 +596,10 @@ xf86_reload_cursors (ScreenPtr screen)
CursorPtr cursor;
int x, y;
- /* initial mode setting will not have set a screen yet */
- if (!screen)
+ /* initial mode setting will not have set a screen yet.
+ May be called before the devices are initialised.
+ */
+ if (!screen || !inputInfo.pointer)
return;
scrn = xf86Screens[screen->myNum];
xf86_config = XF86_CRTC_CONFIG_PTR(scrn);