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

Fix crash on server shutdown

This commit is contained in:
Alexander Gottwald 2005-07-05 18:25:44 +00:00
parent d72fef26d4
commit 20c15003f9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xwin/ChangeLog
View File

@ -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> 2005-07-05 Alexander Gottwald <ago at freedesktop dot org>
* winkeybd.c: * winkeybd.c:

10
hw/xwin/winmultiwindowwm.c
View File

@ -981,6 +981,9 @@ winMultiWindowXMsgProc (void *pArg)
/* Loop until we explicitly break out */ /* Loop until we explicitly break out */
while (1) while (1)
{ {
if (g_shutdown)
break;
if (pProcArg->pWMInfo->fAllowOtherWM && !XPending (pProcArg->pDisplay)) if (pProcArg->pWMInfo->fAllowOtherWM && !XPending (pProcArg->pDisplay))
{ {
if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen)) if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen))
@ -1061,6 +1064,10 @@ winMultiWindowXMsgProc (void *pArg)
winSendMessageToWM (pProcArg->pWMInfo, &msg); winSendMessageToWM (pProcArg->pWMInfo, &msg);
} }
} }
XCloseDisplay (pProcArg->pDisplay);
pthread_exit (NULL);
} }
@ -1338,6 +1345,9 @@ winMultiWindowWMIOErrorHandler (Display *pDisplay)
{ {
ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n"); ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
if (g_shutdown)
pthread_exit(NULL);
/* Restart at the main entry point */ /* Restart at the main entry point */
longjmp (g_jmpWMEntry, WIN_JMP_ERROR_IO); longjmp (g_jmpWMEntry, WIN_JMP_ERROR_IO);