Fix tests for (un)forcing HW cursor. The broken tests caused problems when

    switching to console with 3D clients running.

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 71141db..689179e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-04-29  Michel Dänzer  <michel@daenzer.net>
 
+	* src/radeon_dri.c: (RADEONDRITransitionTo3d),
+	(RADEONDRITransitionTo2d):
+	Fix tests for (un)forcing HW cursor. The broken tests caused problems
+	when switching to console with 3D clients running.
+
+2006-04-29  Michel Dänzer  <michel@daenzer.net>
+
 	* src/radeon_dri.c: (RADEONInitVisualConfigs):
 	Prefer double-buffered visuals. As a consequence, the root window's
 	visual is double-buffered by default, which is desirable in a number of
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index c059100..9f9895d 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1990,7 +1990,7 @@ static void RADEONDRITransitionTo3d(ScreenPtr pScreen)
     RADEONChangeSurfaces(pScrn);
     RADEONEnablePageFlip(pScreen);
 
-    if (info->cursor_offset != 0)
+    if (info->cursor)
 	xf86ForceHWCursor (pScreen, TRUE);
 }
 
@@ -2028,7 +2028,7 @@ static void RADEONDRITransitionTo2d(ScreenPtr pScreen)
 
     RADEONChangeSurfaces(pScrn);
 
-    if (info->cursor_offset != 0)
+    if (info->cursor)
 	xf86ForceHWCursor (pScreen, FALSE);
 }