|
 |
f38a11 |
From a1d6aa2078b8a840469f13ae720669cb4f99291d Mon Sep 17 00:00:00 2001
|
|
|
b814f0 |
From: David Edmundson <davidedmundson@kde.org>
|
|
|
b814f0 |
Date: Fri, 14 May 2021 13:23:24 +0100
|
|
|
f38a11 |
Subject: [PATCH 11/40] Client: Disconnect registry listener on destruction
|
|
|
b814f0 |
|
|
|
b814f0 |
If a display outlives a QWaylandClientExtension and a new global is
|
|
|
b814f0 |
announced we end up delivering an event to a now deleted extension which
|
|
|
b814f0 |
will crash.
|
|
|
b814f0 |
|
|
|
b814f0 |
Change-Id: Idc0de40be61a2f7627ab4963e1fe29b22fbf3f04
|
|
|
b814f0 |
(cherry picked from commit c4ba37cd2f8cb81b9438b56ac604fc2f3e45083c)
|
|
|
b814f0 |
---
|
|
|
b814f0 |
src/client/global/qwaylandclientextension.cpp | 7 +++++++
|
|
|
b814f0 |
src/client/global/qwaylandclientextension.h | 1 +
|
|
|
b814f0 |
2 files changed, 8 insertions(+)
|
|
|
b814f0 |
|
|
|
b814f0 |
diff --git a/src/client/global/qwaylandclientextension.cpp b/src/client/global/qwaylandclientextension.cpp
|
|
|
b814f0 |
index 125b1e19..797b06fe 100644
|
|
|
b814f0 |
--- a/src/client/global/qwaylandclientextension.cpp
|
|
|
b814f0 |
+++ b/src/client/global/qwaylandclientextension.cpp
|
|
|
b814f0 |
@@ -88,6 +88,13 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
|
|
|
b814f0 |
QMetaObject::invokeMethod(this, "addRegistryListener", Qt::QueuedConnection);
|
|
|
b814f0 |
}
|
|
|
b814f0 |
|
|
|
b814f0 |
+QWaylandClientExtension::~QWaylandClientExtension()
|
|
|
b814f0 |
+{
|
|
|
b814f0 |
+ Q_D(QWaylandClientExtension);
|
|
|
b814f0 |
+ if (d->registered && !QCoreApplication::closingDown())
|
|
|
b814f0 |
+ d->waylandIntegration->display()->removeListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
|
|
|
b814f0 |
+}
|
|
|
b814f0 |
+
|
|
|
b814f0 |
QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
|
|
|
b814f0 |
{
|
|
|
b814f0 |
Q_D(const QWaylandClientExtension);
|
|
|
b814f0 |
diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h
|
|
|
b814f0 |
index 98272e57..5bd28398 100644
|
|
|
b814f0 |
--- a/src/client/global/qwaylandclientextension.h
|
|
|
b814f0 |
+++ b/src/client/global/qwaylandclientextension.h
|
|
|
b814f0 |
@@ -63,6 +63,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
|
|
|
b814f0 |
Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
|
|
|
b814f0 |
public:
|
|
|
b814f0 |
QWaylandClientExtension(const int version);
|
|
|
b814f0 |
+ ~QWaylandClientExtension();
|
|
|
b814f0 |
|
|
|
b814f0 |
QtWaylandClient::QWaylandIntegration *integration() const;
|
|
|
b814f0 |
int version() const;
|
|
|
b814f0 |
--
|
|
|
b814f0 |
2.35.1
|
|
|
b814f0 |
|