From bb07d03e2a17fb25801f04d5b59e3ccaf827eeb2 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 5 Aug 2022 13:44:34 +0200 Subject: [PATCH] macOS: Check m_platformWindow before processing key event after shortcut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø (cherry picked from commit 6a5cadb9557ebac00b8ddacf623dc38baa716680) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qnsview_keys.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qnsview_keys.mm b/src/plugins/platforms/cocoa/qnsview_keys.mm index 88e94f2c1c7..dc669d6f3b3 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(queryResult.value(Qt::ImHints).toUInt());