Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

effectively revert 42f9fe4bdf and partially eac4764306

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-17 02:37:50 +03:00
parent 26d098ab90
commit c3890f48f4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/kernel/qapplication_x11.cpp
View file

@ -479,9 +479,12 @@ static int qt_x_errhandler(Display *dpy, XErrorEvent *err)
static int qt_xio_errhandler(Display *)
{
QApplication::exit(1);
// NOTE: this handler can be called if the application receives SIGTERM
// which is not fatal
QByteArray appName = QApplication::applicationName().toLocal8Bit();
qFatal("%s: Fatal IO error: client killed", appName.constData());
qWarning("%s: Fatal IO error: %s", appName.constData(), ::strerror(errno));
QApplication::exit(1);
::exit(1);
return 0;
}
@ -1051,10 +1054,11 @@ void qt_init(QApplicationPrivate *priv, Display *display,
// Connect to X server
if (!qt_x11Data->display) {
if ((qt_x11Data->display = XOpenDisplay(qt_x11Data->displayName)) == 0) {
QApplication::exit(1);
QByteArray appName = QApplication::applicationName().toLocal8Bit();
qFatal("%s: cannot connect to X server %s", appName.constData(),
qWarning("%s: cannot connect to X server %s", appName.constData(),
XDisplayName(qt_x11Data->displayName));
QApplication::exit(1);
::exit(1);
}
if (appSync) // if "-sync" argument