diff options
| author | Weng Xuetian <wengxt@gmail.com> | 2021-03-09 10:43:59 -0800 |
|---|---|---|
| committer | Weng Xuetian <wengxt@gmail.com> | 2021-03-31 07:17:52 -0700 |
| commit | 91625c591c9854c7b6934c12a83df6cbcfcbfbd4 (patch) | |
| tree | 0846be994af05e2df8b4ccf1845c7e583a2b3fcb /src | |
| parent | e7056aeafc4584c6521840350c6e33d8805c6f89 (diff) | |
Use qWarning and _exit() instead of qFatal for wayland error
This type of error is likely to happen upon system logout. qFatal would
trigger sigabrt and leave unnecessary coredump on the system. Using
qWarning here would make it consistent with xcb's io error.
Pick-to: 5.15 6.0 6.1
Change-Id: I571ba007bf2453486b81837cccdbefa5f181b63d
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index a3a562bef..94381992c 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -215,10 +215,11 @@ void QWaylandDisplay::checkError() const int ecode = wl_display_get_error(mDisplay); if ((ecode == EPIPE || ecode == ECONNRESET)) { // special case this to provide a nicer error - qFatal("The Wayland connection broke. Did the Wayland compositor die?"); + qWarning("The Wayland connection broke. Did the Wayland compositor die?"); } else { - qFatal("The Wayland connection experienced a fatal error: %s", strerror(ecode)); + qWarning("The Wayland connection experienced a fatal error: %s", strerror(ecode)); } + _exit(1); } void QWaylandDisplay::flushRequests() |