Skip to content

client: Gracefully handle shutdown and window hiding

Andreas Sturmlechner requested to merge asturmlechner/qtwayland:QTBUG-90037-QTBUG-91264-b19b0fba into kde/5.15

When a window is hidden or destroyed, the render thread may already be rendering. We need to properly read-lock the surface pointer when it is in use and exit when it becomes null.

Note that there is also a potential crash in the Mesa GL driver where it keeps a proxy to the wl_surface, so if we delete this while we are still rendering, it can crash inside the driver. This is not addressed by this patch, and has not been reproduced on any other drivers so far.

[ChangeLog][Client] Fixed a crash that could happen when hiding or closing windows while Qt Quick was actively rendering on a different thread.

Pick-to: 6.0 6.1 5.15 Fixes: QTBUG-91264 Fixes: QTBUG-90037 Task-number: QTBUG-92249 Change-Id: I029b123b83c58740321e8b90a463ced748d8bcf4 Reviewed-by: Laszlo Agocs laszlo.agocs@qt.io Reviewed-by: David Edmundson davidedmundson@kde.org (cherry picked from commit b19b0fba)

Edited by Andreas Sturmlechner

Merge request reports