summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-11-03 14:39:39 +0100
committerJohan Helsing <johan.helsing@qt.io>2016-11-03 15:16:06 +0000
commit59965ed2277bb62e0ec38b149b570285828660fd (patch)
tree4f9bb155a9d78ec1d7a86fd5dd5c65ed1cf0674b /src
parent785f543bed9b0f05c4f6b0de7453faab04c1c8e8 (diff)
Don't ignore wl_surface:attach with null buffer
Update the bufferRef to null so the surface gets hidden. This fixes an issue with popups not popping down properly. Change-Id: Ie6781c0e935998035e06c8498035d786f06a1fe0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 98db1dbe2..f79fd57ef 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -269,7 +269,7 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
{
Q_Q(QWaylandSurface);
- if (pending.buffer.hasBuffer())
+ if (pending.buffer.hasBuffer() || pending.newlyAttached)
bufferRef = pending.buffer;
auto buffer = bufferRef.buffer();