diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-04-26 11:14:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-26 14:18:16 +0200 |
| commit | f8e2a8469f91ac1a7daf73c8ed9c24195e5b5a56 (patch) | |
| tree | dd7334a13d19c0532d8458a63e4c277049e1e9b7 /src/plugins | |
| parent | c90d9b697f6ef549d33047332a9c44b40ded63f5 (diff) | |
Don't crash on null QCoocaMenuItem.
Change-Id: Ia70f616983141134afe874b69a5957e31f6f5ed9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 565c77fd44..c5c5c132bc 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -371,7 +371,8 @@ void QCocoaMenu::syncSeparatorsCollapsible(bool enable) NSMenuItem *item = reinterpret_cast<NSMenuItem *>([itemArray objectAtIndex:i]); if ([item isSeparatorItem]) { QCocoaMenuItem *cocoaItem = reinterpret_cast<QCocoaMenuItem *>([item tag]); - cocoaItem->setVisible(!previousIsSeparator); + if (cocoaItem) + cocoaItem->setVisible(!previousIsSeparator); [item setHidden:previousIsSeparator]; } @@ -384,7 +385,8 @@ void QCocoaMenu::syncSeparatorsCollapsible(bool enable) // We now need to check the final item since we don't want any separators at the end of the list. if (previousItem && previousIsSeparator) { QCocoaMenuItem *cocoaItem = reinterpret_cast<QCocoaMenuItem *>([previousItem tag]); - cocoaItem->setVisible(false); + if (cocoaItem) + cocoaItem->setVisible(false); [previousItem setHidden:YES]; } } else { |