Don't wait for sync replies when closing down server. Use

dmxScreenReplyCheckSync in dmxDisableScreen to unsure that
no pending sync replies exist for the disabled screen.
This commit is contained in:
David Reveman 2008-09-26 16:32:33 -04:00
parent d7ef664c3b
commit a5738a5ec7
2 changed files with 9 additions and 3 deletions

View file

@ -2113,6 +2113,15 @@ dmxDisableScreen (int idx)
/* Screen is now disabled */
dmxScreen->beDisplay = NULL;
/* Make sure we don't have any pending sync replies */
if (!dmxScreen->broken)
{
static xcb_generic_error_t detached_error = { 0, DMX_DETACHED };
dmxScreenReplyCheckSync (pScreen, 0, (xcb_generic_reply_t *)
&detached_error);
}
#ifdef RANDR
RRGetInfo (screenInfo.screens[0]);
#endif

View file

@ -353,9 +353,6 @@ void dmxCloseDisplay(DMXScreenInfo *dmxScreen)
{
RemoveEnabledDevice (dmxScreen->fd);
/* make sure all pending sync replies are processed */
dmxSync (dmxScreen, TRUE);
if (dmxScreen->atomTable)
xfree (dmxScreen->atomTable);
if (dmxScreen->beAtomTable)