frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "xfree86: workaround crash on close" 

This reverts commit 55f552adb6.

This appears to cause a crash at init time instead of close.

Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2012-04-08 00:16:54 -07:00
parent 1110facdfe
commit 10cd6fdc43
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/modes/xf86Rotate.c
View File

@ -272,7 +272,6 @@ xf86RotateDestroy(xf86CrtcPtr crtc)
ScrnInfoPtr pScrn = crtc->scrn; ScrnInfoPtr pScrn = crtc->scrn;
ScreenPtr pScreen = pScrn->pScreen; ScreenPtr pScreen = pScrn->pScreen;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
DrawablePtr screenDrawable = &pScreen->root->drawable;
int c; int c;
/* Free memory from rotation */ /* Free memory from rotation */
@ -290,7 +289,7 @@ xf86RotateDestroy(xf86CrtcPtr crtc)
/* /*
* Clean up damage structures when no crtcs are rotated * Clean up damage structures when no crtcs are rotated
*/ */
if (screenDrawable && xf86_config->rotation_damage) { if (xf86_config->rotation_damage) {
/* Free damage structure */ /* Free damage structure */
if (xf86_config->rotation_damage_registered) { if (xf86_config->rotation_damage_registered) {
DamageUnregister(&pScreen->root->drawable, DamageUnregister(&pScreen->root->drawable,