From 7f72f94aa4f0655b8aab6c67eef2a5f5ac4b418f Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon, 10 Oct 2005 09:31:49 +0000
Subject: [PATCH] rework that again

---
 hw/xfree86/common/xf86RandR.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index bd261f6b3..7beb05469 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -261,15 +261,14 @@ xf86RandRSetConfig (ScreenPtr		pScreen,
      */
     if (pScreen == miPointerCurrentScreen ())
     {
-	if (px < pSize->width && py < pSize->height)
-	    (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE);	    
-
-        if (px >= pScreen->width || py >= pScreen->height) {
+       if (px >= pScreen->width || py >= pScreen->height) {
             px = pScreen->width - 1;
             py = pScreen->height - 1;
         }
 
-        xf86SetViewport(pScreen->myNum, px, py);
+        xf86SetViewport(pScreen, px, py);
+
+        (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE);
     }
 
     return TRUE;