diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2016-12-15 14:24:48 -0800 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-16 04:06:39 +0000 |
| commit | 2a44f81fe7bb76cf7ced5bae5a2654b96f0e93c6 (patch) | |
| tree | 6046486d275a2df1b71aaa32721df9ad60827e31 /src/plugins/platforms/cocoa/qcocoamenu.mm | |
| parent | 9f96e4f431980e33429f8d85cb60e41bd89edbae (diff) | |
QCocoMenu: Fix patch b2f78b796b5b73d4
A null pointer check was accidentally removed while
refactoring the code.
Change-Id: I547936671bd134bb7df710a4b123a0d731076bf2
Task-number: QTCREATORBUG-17438
Task-number: QTBUG-57404
Task-number: QTBUG-57657
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 81db919627..e177a24e73 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -335,7 +335,7 @@ void QCocoaMenu::insertNative(QCocoaMenuItem *item, QCocoaMenuItem *beforeItem) nativeItem.target = m_nativeMenu.delegate; nativeItem.action = @selector(itemFired:); // Someone's adding new items after aboutToShow() was emitted - if (isOpen() && nativeItem) + if (isOpen() && nativeItem && item->menu()) item->menu()->setAttachedItem(nativeItem); item->setParentEnabled(isEnabled()); |