diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2011-03-01 18:08:20 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-03-01 19:40:36 +0200 |
| commit | 1a20edffedf58f602b6d517cdc919115dc64c36a (patch) | |
| tree | 4d65182ce2a69cd83e903b7c8ba75ccb84cb8d8b | |
| parent | eda812f0d7fe0a08b3bdce6e95740f97ecaae2d8 (diff) | |
| download | spice-1a20edffedf58f602b6d517cdc919115dc64c36a.tar.gz spice-1a20edffedf58f602b6d517cdc919115dc64c36a.tar.xz spice-1a20edffedf58f602b6d517cdc919115dc64c36a.zip | |
x11: Use _exit rather then exit on X errors (rhbz#680763)
This avoids us trying to restore the original resolution when we're fullscreen
and an X error happens. As restoring fullscreen is a bad idea then as this
involves making more X calls, which can get us stuck (in side an XLockDisplay
call for example).
| -rw-r--r-- | client/x11/platform.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index 4877798e..48d5a52b 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -3024,14 +3024,14 @@ static int x_error_handler(Display* display, XErrorEvent* error_event) error_str, (uint32_t)error_event->minor_code, request_str); - exit(-1); + _exit(-1); return 0; } static int x_io_error_handler(Display* display) { LOG_ERROR("x io error on %s", XDisplayString(display)); - exit(-1); + _exit(-1); return 0; } |