1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Disconnect registry listener on destruction

Browse Source 
If a display outlives a QWaylandClientExtension and a new global is
announced we end up delivering an event to a now deleted extension which
will crash.

Change-Id: Idc0de40be61a2f7627ab4963e1fe29b22fbf3f04
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
This commit is contained in:
David Edmundson 2021-05-14 13:23:24 +01:00
parent 0ff3bf30d6
commit dbcc603faf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
View File

@ -91,6 +91,13 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
QMetaObject::invokeMethod(this, "initialize", Qt::QueuedConnection);
}
QWaylandClientExtension::~QWaylandClientExtension()
{
Q_D(QWaylandClientExtension);
if (d->registered && !QCoreApplication::closingDown())
d->waylandIntegration->display()->removeListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
}
QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
{
Q_D(const QWaylandClientExtension);

1
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -63,6 +63,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
public:
QWaylandClientExtension(const int version);
~QWaylandClientExtension();
QtWaylandClient::QWaylandIntegration *integration() const;
int version() const;