-
-
Notifications
You must be signed in to change notification settings - Fork 897
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Clean environment when exiting #5941
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rest lgtm, why draft?
4531ba9
to
28452f9
Compare
|
28452f9
to
704f8ed
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
uuuuuh, I accidentally removed this from commit ;-; diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 11834043..ac8b11f0 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -451,6 +451,10 @@ void CCompositor::cleanup() {
wl_display_terminate(m_sWLDisplay);
m_sWLDisplay = nullptr;
+
+ std::string waylandSocket = std::string{getenv("XDG_RUNTIME_DIR")} + "/" + m_szWLDisplaySocket;
+ std::filesystem::remove(waylandSocket);
+ std::filesystem::remove(waylandSocket + ".lock");
}
void CCompositor::initManagers(eManagersInitStage stage) { |
feel free to open a new mr |
Describe your PR, what does it fix/add?
fixes
hyprland doesn't clean up its Wayland sockets after exit #4226
Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
Whether we should unlink the wayland sockets is debatable.
Technically
wl_display_destroy()
should be called to clean up everything wayland.I'm not sure why we don't (maybe wlroots manages this?), but when I tried it stalls Hyprland shutdown and just doesn't end up removing the sockets...
Is it ready for merging, or does it need work?
CCompositor::cleanEnvironment
works as expected on my systembut also see above