diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2022-08-05 13:44:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-05 20:01:36 +0000 |
| commit | bb07d03e2a17fb25801f04d5b59e3ccaf827eeb2 (patch) | |
| tree | 6190b3fd74aa2a8c84ccf663a6c33fae116a6c35 | |
| parent | 33bc1a80d170fa8dbf410bebdaf392c4d0190cb4 (diff) | |
macOS: Check m_platformWindow before processing key event after shortcut
Processing shortcut events may result in the window being deleted, so
we need to check if m_platformWindow is still valid before continuing
with the key press event.
Fixes: QTBUG-105160
Change-Id: I9cd362873b19c078a4fced3ac3c815d70bfc7fbe
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 6a5cadb9557ebac00b8ddacf623dc38baa716680)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_keys.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_keys.mm b/src/plugins/platforms/cocoa/qnsview_keys.mm index 88e94f2c1c..dc669d6f3b 100644 --- a/src/plugins/platforms/cocoa/qnsview_keys.mm +++ b/src/plugins/platforms/cocoa/qnsview_keys.mm @@ -32,7 +32,7 @@ } } - QObject *focusObject = m_platformWindow->window()->focusObject(); + QObject *focusObject = m_platformWindow ? m_platformWindow->window()->focusObject() : nullptr; if (m_sendKeyEvent && focusObject) { if (auto queryResult = queryInputMethod(focusObject, Qt::ImHints)) { auto hints = static_cast<Qt::InputMethodHints>(queryResult.value(Qt::ImHints).toUInt()); |