diff options
author | marha <marha@users.sourceforge.net> | 2010-03-22 09:17:19 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-22 09:17:19 +0000 |
commit | 348130c450be8b5c4abcb03272b326434e3f5022 (patch) | |
tree | 413685260aa63ea6b530af4898603a40f441b768 /xorg-server/hw/xfree86/modes/xf86Cursors.c | |
parent | 4f736752bbdf3bbf1a6325af7ad470198aa5a82a (diff) | |
download | vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.gz vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.bz2 vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.zip |
Updated to xorg-server-1.7.99.902
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c')
-rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index 385848b7a..e2e174e59 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c @@ -461,11 +461,11 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; + ++cursor->refcnt; if (xf86_config->cursor) FreeCursor (xf86_config->cursor, None); xf86_config->cursor = cursor; - ++cursor->refcnt; - + if (cursor->bits->width > cursor_info->MaxWidth || cursor->bits->height> cursor_info->MaxHeight) return FALSE; |