Skip to content

fix: fix ddm stuck into dead event loop after crash recovery #43

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.

Sign up for GitHub

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

Merged
wineee merged 1 commit into from
Sep 10, 2025
Merged

fix: fix ddm stuck into dead event loop after crash recovery #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/daemon/TreelandConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ bool TreelandConnector::isConnected() {
}

void TreelandConnector::setPrivateObject(struct treeland_ddm *ddm) {
if (m_ddm) delete m_ddm;
m_ddm = ddm;
}

Expand Down Expand Up @@ -166,7 +167,7 @@ void registerGlobal(void *data, struct wl_registry *registry, uint32_t name, con
}

void removeGlobal([[maybe_unused]] void *data, [[maybe_unused]] struct wl_registry *registry, [[maybe_unused]] uint32_t name) {
// Do not deregister the global object (set m_priv to null) here,
// Do not deregister the global object (set m_ddm to null) here,
// as wlroots will send global_remove event when session deactivated,
// which is not what we want. The connection will be preserved after that.
}
Expand All @@ -177,6 +178,12 @@ const struct wl_registry_listener registryListener {
};

void TreelandConnector::connect(QString socketPath) {
if (m_display) {
wl_display_disconnect(m_display);
QObject::disconnect(m_notifier, &QSocketNotifier::activated, nullptr, nullptr);
delete m_notifier;
}

m_display = wl_display_connect(qPrintable(socketPath));
auto registry = wl_display_get_registry(m_display);

Expand Down