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

Reset QWindowPrivate::platformWindow during destruction before deleting it

Browse Source 
Otherwise the deletion of the platform window may result in platform events
that then conclude the QWindow has a valid platform window and calls into
it, when it's been half-way destroyed.

Change-Id: If9eaad1b4e6aa414ba0f96475756a2146e0c01d5
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
This commit is contained in:
Tor Arne Vestbø 2017-09-12 12:58:45 +02:00
parent 542e11ab2b
commit 44c304cefb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qwindow.cpp
View File

@ -1882,11 +1882,16 @@ void QWindowPrivate::destroy()
QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed); QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed);
QGuiApplication::sendEvent(q, &e); QGuiApplication::sendEvent(q, &e);
delete platformWindow; // Unset platformWindow before deleting, so that the destructor of the
// platform window does not recurse back into the platform window via
// this window during destruction (e.g. as a result of platform events).
QPlatformWindow *pw = platformWindow;
platformWindow = nullptr;
delete pw;
resizeEventPending = true; resizeEventPending = true;
receivedExpose = false; receivedExpose = false;
exposed = false; exposed = false;
platformWindow = 0;
if (wasVisible) if (wasVisible)
maybeQuitOnLastWindowClosed(); maybeQuitOnLastWindowClosed();