From 91ec8261ab58061ca9e935c4e6a7f1c4a359cc27 Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Mon, 12 Sep 2011 12:31:35 +0200
Subject: Cocoa: Enable native menus.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix menu duplication bug: make QCocoaMenu::addAction
do nothing before the native menu has ben created.

Change-Id: Ifca192421f2073264de9f5faeb053008ecb8532e
Reviewed-on: http://codereview.qt-project.org/5135
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/plugins/platforms/cocoa/qmenu_mac.mm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/plugins/platforms/cocoa/qmenu_mac.mm')

diff --git a/src/plugins/platforms/cocoa/qmenu_mac.mm b/src/plugins/platforms/cocoa/qmenu_mac.mm
index 7ca546dd79..cfedf06daf 100644
--- a/src/plugins/platforms/cocoa/qmenu_mac.mm
+++ b/src/plugins/platforms/cocoa/qmenu_mac.mm
@@ -466,6 +466,9 @@ QCocoaMenu::~QCocoaMenu()
 
 void QCocoaMenu::addAction(QAction *a, QAction *before)
 {
+    if (menu == 0)
+        return;
+
     QCocoaMenuAction *action = new QCocoaMenuAction;
     action->action = a;
     action->ignore_accel = 0;
-- 
cgit v1.2.3