Commit ec4ec056 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Only update wayland activation token if one was provided

parent b3d86129
Pipeline #128041 passed with stage
in 1 minute and 56 seconds
......@@ -1378,7 +1378,11 @@ void Application::handleActivate(const QStringList& arguments)
#endif
#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 83, 0)
if (KWindowSystem::isPlatformWayland()) {
KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN"));
const QString token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
if (!token.isEmpty()) {
KWindowSystem::setCurrentXdgActivationToken(token);
qunsetenv("XDG_ACTIVATION_TOKEN");
}
}
#endif
mainWindow->activateAndRaiseWindow();
......
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