From 92237b22ea80b043bfd441ecad89cd504965b50f Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 11 Jan 2013 17:34:49 +0100 Subject: Cocoa: Make QCocoaMenu::showPopup() more robust Change-Id: Ie4ae5806ea2f23f16597578796be36f2123c05fa Reviewed-by: Richard Moe Gustavsen --- src/plugins/platforms/cocoa/qcocoamenu.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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(parentWindow->handle()); - NSView *view = cocoaWindow->contentView(); + QCocoaWindow *cocoaWindow = parentWindow ? static_cast(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]; -- cgit v1.2.3