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

xfree86: workaround crash on close 

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41653

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
This commit is contained in:
Michal Suchanek 2012-03-28 18:12:39 -07:00 committed by Jeremy Huddleston
parent adcb48a29d
commit fa6dddc6ce
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,14 +290,19 @@ xf86RotateDestroy(xf86CrtcPtr crtc)
* Clean up damage structures when no crtcs are rotated * Clean up damage structures when no crtcs are rotated
*/ */
if (xf86_config->rotation_damage) { if (xf86_config->rotation_damage) {
DrawablePtr screenDrawable = NULL;
if (pScreen && pScreen->root)
screenDrawable = &pScreen->root->drawable;
/* Free damage structure */ /* Free damage structure */
if (xf86_config->rotation_damage_registered) { if (xf86_config->rotation_damage_registered) {
DamageUnregister(&pScreen->root->drawable, if (screenDrawable)
xf86_config->rotation_damage); DamageUnregister(screenDrawable,
xf86_config->rotation_damage);
xf86_config->rotation_damage_registered = FALSE; xf86_config->rotation_damage_registered = FALSE;
DisableLimitedSchedulingLatency(); DisableLimitedSchedulingLatency();
} }
DamageDestroy(xf86_config->rotation_damage); if (screenDrawable)
DamageDestroy(xf86_config->rotation_damage);
xf86_config->rotation_damage = NULL; xf86_config->rotation_damage = NULL;
} }
} }