diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-04-23 14:29:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 18:57:45 +0200 |
| commit | 56cc59110a437658b8f0b6113834fd0ca157e448 (patch) | |
| tree | 1bac3f5adac483e18aa3ad03a58649f8f8fff92d /src/plugins/platforms/cocoa | |
| parent | f2fa65e4bfa09da6e857cd8c333eec5b1a87d318 (diff) | |
Don't crash on a null window pointer.
Task-number: QTBUG-30731
Change-Id: Id256b915012b43d1eb85bba62cbc1d42cfb58b34
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index daceb1e8ad..64e2b619c1 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -231,6 +231,9 @@ void QCocoaNativeInterface::setWindowContentView(QPlatformWindow *window, void * void QCocoaNativeInterface::registerTouchWindow(QWindow *window, bool enable) { + if (!window) + return; + // Make sure the QCocoaWindow is created when enabling. Disabling might // happen on window destruction, don't (re)create the QCocoaWindow then. if (enable) |