yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wayland backend: Don't crash when terminating

Browse source 
Remember to release all resources before the wayland socket goes:
- release the seat as we give up a seat
- release the ssdManager
- release the output decoration with the output itself
Otherwise they leak and stay dangling.
This commit is contained in:
Aleix Pol Gonzalez 2022-09-15 16:43:04 +00:00
parent d7cba6b625
commit fdf2011b34
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/backends/wayland/wayland_backend.cpp
View file

@ -485,6 +485,7 @@ WaylandSeat::~WaylandSeat()
destroyPointerDevice();
destroyKeyboardDevice();
destroyTouchDevice();
m_seat->release();
}
void WaylandSeat::createPointerDevice()
@ -578,6 +579,13 @@ WaylandBackend::~WaylandBackend()
eglTerminate(sceneEglDisplay());
}
if (m_relativePointerManager) {
m_relativePointerManager->release();
}
if (m_ssdManager) {
m_ssdManager->release();
}
if (m_pointerGestures) {
m_pointerGestures->release();
}
@ -768,7 +776,7 @@ WaylandOutput *WaylandBackend::createOutput(const QString &name, const QSize &si
}
if (ssdManager()) {
auto decoration = ssdManager()->create(surface.get(), this);
auto decoration = ssdManager()->create(surface.get(), surface.get());
connect(decoration, &ServerSideDecoration::modeChanged, this, [decoration] {
if (decoration->mode() != ServerSideDecoration::Mode::Server) {
decoration->requestMode(ServerSideDecoration::Mode::Server);