diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-01-09 16:48:18 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-01-09 16:48:18 +0100 |
| commit | 512eeb2af94b7e19290c947e218a87ea6439abde (patch) | |
| tree | 3a557abe8e33a3fbc6d0ecf6dbd14965a96ae70d /src/client/qwaylandsurface.cpp | |
| parent | 741506eb89a59f960f25706329e7b4d0332c1eb9 (diff) | |
| parent | d97c657be9d6433d99889aa68e888076a921d70d (diff) | |
Merge remote-tracking branch 'qt/5.15' into dev
Change-Id: Id0bb84667482232cb648f4984e9f9e2ea4c360c6
Diffstat (limited to 'src/client/qwaylandsurface.cpp')
| -rw-r--r-- | src/client/qwaylandsurface.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/client/qwaylandsurface.cpp b/src/client/qwaylandsurface.cpp index c35f01b56..21e70ce4f 100644 --- a/src/client/qwaylandsurface.cpp +++ b/src/client/qwaylandsurface.cpp @@ -72,8 +72,12 @@ QWaylandSurface *QWaylandSurface::fromWlSurface(::wl_surface *surface) void QWaylandSurface::handleScreenRemoved(QScreen *qScreen) { - auto *screen = static_cast<QWaylandScreen *>(qScreen->handle()); - if (m_screens.removeOne(screen)) + auto *platformScreen = qScreen->handle(); + if (platformScreen->isPlaceholder()) + return; + + auto *waylandScreen = static_cast<QWaylandScreen *>(qScreen->handle()); + if (m_screens.removeOne(waylandScreen)) emit screensChanged(); } |