diff options
| author | Inho Lee <inho.lee@qt.io> | 2023-07-05 17:13:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-04 13:03:23 +0000 |
| commit | c9a73ec8237e9135d189dbb40dd4eb53a72d2722 (patch) | |
| tree | d40c8f84bf1e3b1b10c5e50016b14aeaa513e19e | |
| parent | 5d9534ba95715eade23ab04a4ac2786f1d749361 (diff) | |
Only remove initialized extensions in ExtContainer
Only initialized extensions should be in the extension_vector.
Change-Id: I174c4eedae472aa5412c3f2b8a102adbc812fe40
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 3da1356f306860084cf0f6c673c02150fadcfb7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/global/qwaylandcompositorextension.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/global/qwaylandcompositorextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp index d9c42b29b..3a10d177a 100644 --- a/src/compositor/global/qwaylandcompositorextension.cpp +++ b/src/compositor/global/qwaylandcompositorextension.cpp @@ -277,6 +277,8 @@ void QWaylandObject::addExtension(QWaylandCompositorExtension *extension) */ void QWaylandObject::removeExtension(QWaylandCompositorExtension *extension) { + if (!extension->isInitialized()) + return; Q_ASSERT(extension_vector.contains(extension)); extension_vector.removeOne(extension); } |