1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when starting clients

Browse Source 
Don't send wl_surface::set_input_region requests before the wl_surface has been
initialized.

The shapedclock example used to crash in wl_proxy_marshal prior to this fix.

Task-number: QTBUG-57757
Change-Id: I0a459d374bfb88fb22d048eda3722a41112d67a4
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2017-01-02 13:15:36 +01:00 committed by Jani Heikkinen
parent 7a116ac3f0
commit 18d0f87b87
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -350,8 +350,11 @@ void QWaylandWindow::setMask(const QRegion &mask)
mMask = mask;
if (!isInitialized())
return;
if (mMask.isEmpty()) {
set_input_region(0);
set_input_region(nullptr);
} else {
struct ::wl_region *region = mDisplay->createRegion(mMask);
set_input_region(region);