diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-16 14:52:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-16 14:52:47 +0200 |
| commit | e12a88a1a4897365d47e428bceda547a4e02fbd0 (patch) | |
| tree | 116944397f595fd9b72d8de3b0a3783ccf3937ef /xorg-server/hw/xfree86/modes | |
| parent | f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1 (diff) | |
| parent | 4aac32998c2b173b84aec0b020aa086fef4b1423 (diff) | |
| download | vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.tar.gz vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.tar.bz2 vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 154f684c4..1947c5be9 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -726,6 +726,12 @@ xf86CrtcCloseScreen(ScreenPtr screen) xf86RotateCloseScreen(screen); + xf86RandR12CloseScreen(screen); + + free(config->name); + + screen->CloseScreen(screen); + for (o = 0; o < config->num_output; o++) { xf86OutputPtr output = config->output[o]; @@ -749,10 +755,7 @@ xf86CrtcCloseScreen(ScreenPtr screen) else if (screen->current_master) DetachUnboundGPU(screen); } - xf86RandR12CloseScreen(screen); - - free(config->name); - return screen->CloseScreen(screen); + return TRUE; } /* |