Fix crash on server shutdown
This commit is contained in:
parent
d72fef26d4
commit
20c15003f9
|
@ -1,3 +1,8 @@
|
|||
2005-07-05 Alexander Gottwald <ago at freedesktop dot org>
|
||||
|
||||
* winmultiwindowwm.c:
|
||||
Fix crash on server shutdown
|
||||
|
||||
2005-07-05 Alexander Gottwald <ago at freedesktop dot org>
|
||||
|
||||
* winkeybd.c:
|
||||
|
|
|
@ -981,6 +981,9 @@ winMultiWindowXMsgProc (void *pArg)
|
|||
/* Loop until we explicitly break out */
|
||||
while (1)
|
||||
{
|
||||
if (g_shutdown)
|
||||
break;
|
||||
|
||||
if (pProcArg->pWMInfo->fAllowOtherWM && !XPending (pProcArg->pDisplay))
|
||||
{
|
||||
if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen))
|
||||
|
@ -1061,6 +1064,10 @@ winMultiWindowXMsgProc (void *pArg)
|
|||
winSendMessageToWM (pProcArg->pWMInfo, &msg);
|
||||
}
|
||||
}
|
||||
|
||||
XCloseDisplay (pProcArg->pDisplay);
|
||||
pthread_exit (NULL);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -1338,6 +1345,9 @@ winMultiWindowWMIOErrorHandler (Display *pDisplay)
|
|||
{
|
||||
ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
|
||||
|
||||
if (g_shutdown)
|
||||
pthread_exit(NULL);
|
||||
|
||||
/* Restart at the main entry point */
|
||||
longjmp (g_jmpWMEntry, WIN_JMP_ERROR_IO);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user