diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-10-23 18:37:16 +0300 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-10-28 09:52:16 +0100 |
commit | 7882407bb6bab6c042fd20592a63a875b74eb581 (patch) | |
tree | 811ad63b66919641735117260db76ee442ad0812 /src/compositor/wayland_wrapper/qwlsurface.cpp | |
parent | 806ada3e8b8d1ea8f29c839f22963417f7c34a90 (diff) |
Be more careful when destroying wl_resourcesv5.4.0-rc1v5.4.0
The compositor must not destroy wl_resources when it wants to, else it
breaks the contract with the client.
Change-Id: Ic0d298072cdf0954d2504c04bff2bcc99733e621
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlsurface.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlsurface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index e63fcff25..5cd8bb506 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -338,8 +338,7 @@ Qt::ScreenOrientation Surface::contentOrientation() const void Surface::surface_destroy_resource(Resource *) { if (m_extendedSurface) { - if (m_extendedSurface->resource()) - wl_resource_destroy(m_extendedSurface->resource()->handle); + m_extendedSurface->setParentSurface(Q_NULLPTR); m_extendedSurface = 0; } |