twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-29 10:53:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

core: cleanup environment on exit (#5941)

Browse Source
This commit is contained in:
Ikalco
2024-05-08 12:11:08 -05:00
committed by GitHub
parent d1ad490cda
commit 6a988d9276
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Compositor.cpp
View File

@@ -341,6 +341,28 @@ void CCompositor::removeAllSignals() {
removeWLSignal(&Events::listen_sessionActive);
}
void CCompositor::cleanEnvironment() {
// in compositor constructor
unsetenv("WAYLAND_DISPLAY");
// in startCompositor
unsetenv("HYPRLAND_INSTANCE_SIGNATURE");
// in main
unsetenv("HYPRLAND_CMD");
unsetenv("XDG_BACKEND");
unsetenv("XDG_CURRENT_DESKTOP");
if (m_sWLRSession) {
const auto CMD =
#ifdef USES_SYSTEMD
"systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME && hash "
"dbus-update-activation-environment 2>/dev/null && "
#endif
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME";
g_pKeybindManager->spawn(CMD);
}
}
void CCompositor::cleanup() {
if (!m_sWLDisplay || m_bIsShuttingDown)
return;
@@ -358,6 +380,8 @@ void CCompositor::cleanup() {
Systemd::SdNotify(0, "STOPPING=1");
#endif
cleanEnvironment();
// unload all remaining plugins while the compositor is
// still in a normal working state.
g_pPluginSystem->unloadAllPlugins();