summaryrefslogtreecommitdiffstats
path: root/app/x11_util.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 16:50:32 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 16:50:32 +0000
commit8edecdc67d0352711465c8cca5cb239faad8c330 (patch)
tree5c4d4749cbd8a837f6970baf0f114d42e7337b33 /app/x11_util.cc
parent727903ab7a18eeef65eab2ea98c65846960e39b7 (diff)
downloadchromium_src-8edecdc67d0352711465c8cca5cb239faad8c330.zip
chromium_src-8edecdc67d0352711465c8cca5cb239faad8c330.tar.gz
chromium_src-8edecdc67d0352711465c8cca5cb239faad8c330.tar.bz2
Change default xioerror to _exit() instead of crash
BUG=57924 TEST=Run under Xephyr, bring up plugin, ensure that no crash happens. Review URL: http://codereview.chromium.org/4712004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/x11_util.cc')
-rw-r--r--app/x11_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/x11_util.cc b/app/x11_util.cc
index 4c48187..67aa6ba 100644
--- a/app/x11_util.cc
+++ b/app/x11_util.cc
@@ -62,8 +62,8 @@ int DefaultX11ErrorHandler(Display* d, XErrorEvent* e) {
int DefaultX11IOErrorHandler(Display* d) {
// If there's an IO error it likely means the X server has gone away
- LOG(FATAL) << "X IO Error detected";
- return 0;
+ LOG(ERROR) << "X IO Error detected";
+ _exit(1);
}
} // namespace