diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
| commit | 1772aa9a9c51332dee3cb942c2d69125ac9a67dc (patch) | |
| tree | 5a18f22bf0d174b014a9d3b1b1723a3d4730c9c6 /xorg-server/hw/xfree86/modes | |
| parent | cc7c9d67342d9d79ab9f490db492902f7aab2bbb (diff) | |
| parent | d34fc70fab4607f70184206a592397c97c3e478e (diff) | |
| download | vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.gz vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.bz2 vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86RandR12.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c index 6ea9d26b6..1fc63c4dc 100644 --- a/xorg-server/hw/xfree86/modes/xf86RandR12.c +++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c @@ -871,7 +871,12 @@ xf86RandR12Init (ScreenPtr pScreen) #ifdef PANORAMIX /* XXX disable RandR when using Xinerama */ if (!noPanoramiXExtension) - return TRUE; + { + if (xf86NumScreens == 1) + noPanoramiXExtension = TRUE; + else + return TRUE; + } #endif if (xf86RandR12Generation != serverGeneration) |