diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
| commit | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch) | |
| tree | 3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/hw/xfree86/modes/xf86Crtc.c | |
| parent | af64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff) | |
| parent | 87559ccfc67a98a75fa8068066871c35caa88e30 (diff) | |
| download | vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2 vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Crtc.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 6a56e31cc..beb9be66e 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -572,8 +572,11 @@ xf86OutputInitialRotation (xf86OutputPtr output) OPTION_ROTATE);
int i;
- if (!rotate_name)
+ if (!rotate_name) {
+ if (output->initial_rotation)
+ return output->initial_rotation;
return RR_Rotate_0;
+ }
for (i = 0; i < 4; i++)
if (xf86nameCompare (direction[i], rotate_name) == 0)
|