From 4944f4d57c814390bfcb4efb3d0e9c9805aab74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Wed, 10 Jan 2018 14:45:39 +0100
Subject: Cocoa: Prevent crash on focusObjectChanged()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t crash on focusObjectChanged to a QWindow with
a null QPlatformWindow.

Change-Id: Ibf426521d6c8f8b2b2e94d5b92020fa510a74133
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/cocoa/qcocoainputcontext.mm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.mm')

diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
index 9221099a57..d0baea5b36 100644
--- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
@@ -129,6 +129,8 @@ void QCocoaInputContext::focusObjectChanged(QObject *focusObject)
             return;
 
         QCocoaWindow *window = static_cast<QCocoaWindow *>(mWindow->handle());
+        if (!window)
+            return;
         QNSView *view = qnsview_cast(window->view());
         if (!view)
             return;
-- 
cgit v1.2.3