diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
| commit | 9691d196c34d551ebc33843692afd0ee23b9389b (patch) | |
| tree | 184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/hw | |
| parent | f49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff) | |
| download | vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2 vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip | |
svn merge -r549:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86RandR.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86RandR.c b/xorg-server/hw/xfree86/common/xf86RandR.c index 02dcc34b4..d4beb2ce2 100644 --- a/xorg-server/hw/xfree86/common/xf86RandR.c +++ b/xorg-server/hw/xfree86/common/xf86RandR.c @@ -163,7 +163,7 @@ xf86RandRSetMode (ScreenPtr pScreen, WindowPtr pRoot = WindowTable[pScreen->myNum]; Bool ret = TRUE; - if (pRoot) + if (pRoot && scrp->vtSema) (*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE); if (useVirtual) { @@ -229,7 +229,7 @@ xf86RandRSetMode (ScreenPtr pScreen, */ xf86SetViewport (pScreen, pScreen->width, pScreen->height); xf86SetViewport (pScreen, 0, 0); - if (pRoot) + if (pRoot && scrp->vtSema) (*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE); return ret; } |