summaryrefslogtreecommitdiffstats
path: root/client/x11
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-03-01 18:08:20 +0200
committerHans de Goede <hdegoede@redhat.com>2011-03-01 18:08:20 +0200
commit15b82522899af85209166f32c9e4e2e7e047eda3 (patch)
tree599bc8a77a8fdcee840cb75624a18465aa2bf4bd /client/x11
parente9ee6cf914a206a7ecc3b378e2360e6b0a0b61cc (diff)
downloadspice-15b82522899af85209166f32c9e4e2e7e047eda3.tar.gz
spice-15b82522899af85209166f32c9e4e2e7e047eda3.tar.xz
spice-15b82522899af85209166f32c9e4e2e7e047eda3.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).
Diffstat (limited to 'client/x11')
-rw-r--r--client/x11/platform.cpp4
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;
}