diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-23 13:13:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-23 13:17:07 +0200 |
| commit | b240a1c188b58e3e717335339bfc3f5e20bb2bf4 (patch) | |
| tree | 513f6a7231dc64918b4e538b84e81a47c0f97f68 /vcl/unx | |
| parent | 1d1626f284790be9bf5dd2c6a7c148f2e05c8957 (diff) | |
rhbz#1000150: Do not call exit upon XIOError, take two
The _XDefaultIOError handler (libX11-1.6.0/src/XlibInt.c) already calls exit
(even though _XIOError calling _XDefaultIOError would call exit afterwards,
too), so our XIOError handler must not call aOrigXIOErrorHandler.
Change-Id: I92655f22d25ec1358fb6234c94fdfab368efedba
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 0df6b10f370f..c2ec520ff200 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -511,10 +511,9 @@ GtkData::GtkData( SalInstance *pInstance ) XIOErrorHandler aOrigXIOErrorHandler = NULL; -int XIOErrorHdl(Display *pDisplay) +int XIOErrorHdl(Display *) { - if (aOrigXIOErrorHandler) - aOrigXIOErrorHandler(pDisplay); + fprintf(stderr, "X IO Error\n"); _exit(1); // avoid crashes in unrelated threads that still run while atexit // handlers are in progress |