diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-21 20:51:40 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-13 10:13:47 +0000 |
| commit | a37e9b44e7e758fef98377e1766e2fb042c4eea4 (patch) | |
| tree | b154a8989f8fb33fa066f1aa3dd356be0abb9330 | |
| parent | c87757af488f2d6b4f5193413f55bcc902b0f90e (diff) | |
Android: Don't assert in add/removeWindow
No need to assert, returning when the window is already added or not
removed is enough.
Fixes: QTBUG-100173
Change-Id: Id491f17612ce42c4e26e9d41ad38f0a6372775bd
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 2da00bfc3a4361eb1bf2e008ddaceb215c63934d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index fdb027b9de..d9f4c6ab88 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -191,7 +191,9 @@ void QAndroidPlatformScreen::addWindow(QAndroidPlatformWindow *window) if (window->parent() && window->isRaster()) return; - Q_ASSERT(!m_windowStack.contains(window)); + if (m_windowStack.contains(window)) + return; + m_windowStack.prepend(window); if (window->isRaster()) { m_rasterSurfaces.ref(); @@ -208,10 +210,10 @@ void QAndroidPlatformScreen::removeWindow(QAndroidPlatformWindow *window) if (window->parent() && window->isRaster()) return; - - Q_ASSERT(m_windowStack.contains(window)); m_windowStack.removeOne(window); - Q_ASSERT(!m_windowStack.contains(window)); + + if (m_windowStack.contains(window)) + qWarning() << "Failed to remove window"; if (window->isRaster()) { m_rasterSurfaces.deref(); |