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

Reset mFrameCallback in destruction

Browse Source 
Otherwise we crash if we call reset twice. For example if we call
setParent and setVisible together.

Change-Id: I7f07825167bf8c3236a80e649a6d6805fd6c868b
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
David Edmundson 2017-07-19 13:01:24 +01:00
parent 7a41c0171c
commit 6a1f52c90d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,8 +249,10 @@ void QWaylandWindow::reset()
if (isInitialized()) if (isInitialized())
destroy(); destroy();
if (mFrameCallback) if (mFrameCallback) {
wl_callback_destroy(mFrameCallback); wl_callback_destroy(mFrameCallback);
mFrameCallback = nullptr;
}
} }
QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface) QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)