diff options
| author | Weng Xuetian <wengxt@gmail.com> | 2021-03-09 10:43:59 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-31 16:19:54 +0000 |
| commit | 2c429f742b5593bf9a3f6e90d60f76ed434d4946 (patch) | |
| tree | 1d9ce51addfefbd223a2b94a36882b155c108b36 | |
| parent | 560d8a3bb8853c3d5a20d23aec77ee00ba71b718 (diff) | |
| download | qtwayland-2c429f742b5593bf9a3f6e90d60f76ed434d4946.tar.gz | |
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.
Change-Id: I571ba007bf2453486b81837cccdbefa5f181b63d
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 91625c591c9854c7b6934c12a83df6cbcfcbfbd4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 f6b69851..39e84ad2 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -206,10 +206,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() |