Commit 03a8c807 authored by David Edmundson's avatar David Edmundson
Browse files

Support kwin_wayland_restarter

We no longer need --exit-with-session as plasma_shutdown explicitly
quits kwin gracefully.

We also don't want to relaunch ksplash if kwin restarts.

We run the whole script as we need to restart ksmserver as xserver will
be restarted.

For other services, if they get restored through crash handlers or this
doesn't really matter. DBus unique-ness will take care of it.
parent 9c2bc25a
......@@ -90,9 +90,9 @@ int main(int argc, char** argv)
args << QString::fromLocal8Bit(argv[i]);
}
} else {
args = QStringList { QStringLiteral("--xwayland"), QStringLiteral("--exit-with-session=" CMAKE_INSTALL_FULL_LIBEXECDIR "/startplasma-waylandsession") };
args = QStringList {QStringLiteral("--xwayland"), QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/startplasma-waylandsession") };
}
runSync(QStringLiteral(KWIN_WAYLAND_BIN_PATH), args);
runSync(QStringLiteral("kwin_wayland_wrapper"), args);
out << "startplasmacompositor: Shutting down...\n";
cleanupPlasmaEnvironment();
......
......@@ -38,8 +38,11 @@ int main(int argc, char** argv)
// * Then ksmserver is started which takes control of the rest of the startup sequence
setupFontDpi();
QScopedPointer<QProcess, KillBeforeDeleter> ksplash;
QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
if (!qEnvironmentVariableIsSet("KWIN_RESTART_COUNT")) {
ksplash.reset(setupKSplash());
}
out << "startplasma-waylandsession: Starting up...";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment