diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-07-29 11:39:40 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-07-29 14:19:23 -0700 |
| commit | 2d557683f4e791b8bbf3f0cd6dfb99055772e680 (patch) | |
| tree | 87e4b7665b43655bcacfcf181440189dd3c5d58c | |
| parent | 0b4e0172fa90d72bd12863f52ecfac47a3be4e3b (diff) | |
XQuartz: xpbproxy: Don't take down the whole server on an IO error
Calls pthread_exit to prevent _XIOError from calling exit()
This fixes http://xquartz.macosforge.org/trac/ticket/421
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 750d4e82a0c1161292d24216bcff200cd6647611)
| -rw-r--r-- | hw/xquartz/pbproxy/main.m | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xquartz/pbproxy/main.m b/hw/xquartz/pbproxy/main.m index 560cf0182..bb0646502 100644 --- a/hw/xquartz/pbproxy/main.m +++ b/hw/xquartz/pbproxy/main.m @@ -75,6 +75,8 @@ static int x_io_error_handler (Display *dpy) { exit(EXIT_FAILURE); #endif + /* Prevent _XIOError from calling exit() */ + pthread_exit(NULL); return 0; } |