diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-01-10 14:45:39 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-01-18 12:44:31 +0000 |
| commit | 4944f4d57c814390bfcb4efb3d0e9c9805aab74d (patch) | |
| tree | fd9e1b04585a37e2576cf139e9b2924cebc08b16 /src/plugins/platforms/cocoa/qcocoainputcontext.mm | |
| parent | f0c38af8a74a99c708ad0c525bf5a335c652d8c5 (diff) | |
Cocoa: Prevent crash on focusObjectChanged()
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>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.mm | 2 |
1 files changed, 2 insertions, 0 deletions
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; |