AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Check that platform window is valid after delivering close event

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2020-06-15 23:22:31 +02:00
parent e7d76d79e8
commit 28f6892717
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qnsview_mouse.mm
View File

@ -400,6 +400,8 @@
selfClosed = self == popup->view(); selfClosed = self == popup->view();
QWindowSystemInterface::handleCloseEvent(popup->window()); QWindowSystemInterface::handleCloseEvent(popup->window());
QWindowSystemInterface::flushWindowSystemEvents(); QWindowSystemInterface::flushWindowSystemEvents();
if (!m_platformWindow)
return; // Bail out if window was destroyed
} }
// Consume the mouse event when closing the popup, except for tool tips // Consume the mouse event when closing the popup, except for tool tips
// were it's expected that the event is processed normally. // were it's expected that the event is processed normally.