diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-15 23:22:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-26 14:41:41 +0200 |
| commit | 28f689271737d98a23c18b5be2f7f8e1988c1268 (patch) | |
| tree | f04eec1ea9a3f54cb333931d7b5ed383d8c3346c /src/plugins/platforms/cocoa/qnsview_mouse.mm | |
| parent | e7d76d79e8d48b7d38ac635e9ac8c3b667c1aaa2 (diff) | |
macOS: Check that platform window is valid after delivering close event
Fixes: QTBUG-78814
Pick-to: 5.15
Change-Id: I551024c5d777999f7c79d21fd7b7de061c18f971
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview_mouse.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_mouse.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index 9e2761f850..b42f2d0e7e 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -400,6 +400,8 @@ selfClosed = self == popup->view(); QWindowSystemInterface::handleCloseEvent(popup->window()); QWindowSystemInterface::flushWindowSystemEvents(); + if (!m_platformWindow) + return; // Bail out if window was destroyed } // Consume the mouse event when closing the popup, except for tool tips // were it's expected that the event is processed normally. |