fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 02:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'server-1.5-branch' into xorg-server-1.5-apple

Browse source
This commit is contained in:
Jeremy Huddleston 2008-09-12 15:16:16 -07:00
commit d96f2c5978
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dix/dispatch.c
View file

@ -1338,8 +1338,8 @@ CreatePmap:
}
if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
return(client->noClientException);
(*pDraw->pScreen->DestroyPixmap)(pMap);
}
(*pDraw->pScreen->DestroyPixmap)(pMap);
return (BadAlloc);
}

2
hw/xfree86/modes/xf86Crtc.c
View file

@ -1737,7 +1737,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
xf86OutputPtr output;
xf86CrtcPtr crtc;
DisplayModePtr last, mode;
DisplayModePtr last, mode = NULL;
output = SetCompatOutput(config);