Skip to content
Snippets Groups Projects
Commit 40c2bf7a authored by David Faure's avatar David Faure
Browse files

Disable glib event loop in klauncher, since it triggers a nasty bug.

("autostart never finishes, ksmserver ignores logout/shutdown")

BUG: 328571
FIXED-IN: 5.15
parent d182afb2
No related branches found
No related tags found
No related merge requests found
......@@ -152,10 +152,21 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
// WABA: Make sure not to enable session management.
putenv(strdup("SESSION_MANAGER="));
// Disable the GLib event loop (rh#983110)
const bool wasQtNoGlibSet = !qEnvironmentVariableIsEmpty("QT_NO_GLIB");
if (!wasQtNoGlibSet) {
qputenv("QT_NO_GLIB", "1");
}
// We need a QGuiApplication as we use X11
QGuiApplication app(argc, argv);
app.setApplicationName(QStringLiteral("klauncher"));
// Now get rid of QT_NO_GLIB again so launched processes don't inherit it
if (!wasQtNoGlibSet) {
qunsetenv("QT_NO_GLIB");
}
int maxTry = 3;
while (true) {
QString service(QLatin1String("org.kde.klauncher5")); // same as ktoolinvocation.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment