yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid setting crash count to 0 when restarted

Browse source 
If kwin is explicitly restarted (kwin_wayland --replace) we reset the
crash count so that you can run it more than 10 times without exiting to
the logout screen.

Resetting to 0 causes a issue as that triggers ksplash to be shown
again.

BUG: 434489
This commit is contained in:
David Edmundson 2021-07-20 13:01:50 +01:00
parent ec9c2c3e68
commit 0c6a8e7b88
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/helpers/wayland_wrapper/kwin_wrapper.cpp
View file

@ -21,17 +21,16 @@
*/
#include <QCoreApplication>
#include <QProcess>
#include <QDebug>
#include <QProcess>
#include "wl-socket.h"
#define WAYLAND_ENV_NAME "WAYLAND_DISPLAY"
class KWinWrapper : public QObject
{
Q_OBJECT
Q_OBJECT
public:
KWinWrapper(QObject *parent);
~KWinWrapper();
@ -43,7 +42,7 @@ private:
QString m_oldWaylandEnv;
};
KWinWrapper::KWinWrapper(QObject* parent)
KWinWrapper::KWinWrapper(QObject *parent)
: QObject(parent)
{
m_socket = wl_socket_create();
@ -73,25 +72,24 @@ void KWinWrapper::run()
qputenv("KWIN_RESTART_COUNT", QByteArray::number(crashCount));
}
int exitStatus = runKwin();
int exitStatus = runKwin();
if (exitStatus == 133) {
crashCount = 0;
qDebug() << "Compositor restarted, respawning" << Qt::endl;
crashCount = 1;
qDebug() << "Compositor restarted, respawning";
} else if (exitStatus == -1) {
// kwin_crashed, lets go again
qWarning() << "Compositor crashed, respawning" << Qt::endl;
qWarning() << "Compositor crashed, respawning";
} else {
qWarning() << "Compositor exited with code" << exitStatus << Qt::endl;
qWarning() << "Compositor exited with code: " << exit;
break;
}
}
}
int KWinWrapper::runKwin()
{
qDebug() << "Launching kwin\n";
qDebug() << "Launching kwin";
auto process = new QProcess(qApp);
process->setProgram("kwin_wayland");