diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-01-11 17:34:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 15:31:22 +0100 |
| commit | 92237b22ea80b043bfd441ecad89cd504965b50f (patch) | |
| tree | cbd2f3d12c186c4925df95faa9579b187e51da2e /src/plugins/platforms/cocoa | |
| parent | b5922c89ba942f59d52ebbbf4986565ef410a14d (diff) | |
Cocoa: Make QCocoaMenu::showPopup() more robust
Change-Id: Ie4ae5806ea2f23f16597578796be36f2123c05fa
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index afd007b36a..ff3aeaeb11 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -307,8 +307,8 @@ void QCocoaMenu::setVisible(bool visible) void QCocoaMenu::showPopup(const QWindow *parentWindow, QPoint pos, const QPlatformMenuItem *item) { - QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(parentWindow->handle()); - NSView *view = cocoaWindow->contentView(); + QCocoaWindow *cocoaWindow = parentWindow ? static_cast<QCocoaWindow *>(parentWindow->handle()) : 0; + NSView *view = cocoaWindow ? cocoaWindow->contentView() : nil; NSMenuItem *nsItem = item ? ((QCocoaMenuItem *)item)->nsItem() : nil; NSPoint nsPos = NSMakePoint(pos.x(), pos.y()); [m_nativeMenu popUpMenuPositioningItem:nsItem atLocation:nsPos inView:view]; |