xserver: Branch 'mpx'
Peter Hutterer
whot at kemper.freedesktop.org
Fri May 2 05:00:58 PDT 2008
hw/xfree86/modes/xf86Cursors.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6f63724b28c8b3fd85314fb95d1e4f363b610e19
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri May 2 14:56:58 2008 +0930
xfree86: don't try to repaint the cursor before cursors exist.
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 42a4eaa..73a4663 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);
More information about the xorg-commit
mailing list