From c46f59fadf63b661d8611e5896f09fb85c17a00c Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@nokia.com>
Date: Tue, 4 Oct 2011 18:16:34 +0200
Subject: Cocoa: Fix a variable shadowing issue that caused a crash on mac

Change-Id: I2d5ceb9502c769b5a585cdc6f1053168dfadbf12
Reviewed-on: http://codereview.qt-project.org/6000
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
---
 src/plugins/platforms/cocoa/qmenu_mac.mm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/cocoa/qmenu_mac.mm b/src/plugins/platforms/cocoa/qmenu_mac.mm
index cfedf06daf..f62e4a9fd2 100644
--- a/src/plugins/platforms/cocoa/qmenu_mac.mm
+++ b/src/plugins/platforms/cocoa/qmenu_mac.mm
@@ -755,9 +755,10 @@ void QCocoaMenu::setMenuEnabled(bool enable)
             }
         }
     } else {
-        NSMenu *menu = menu;
-        for (NSMenuItem *item in [menu itemArray]) {
-            [item setEnabled:false];
+        NSMenu *m = menu;
+        for (NSMenuItem *item in [m itemArray]) {
+            if (item)
+                [item setEnabled:false];
         }
     }
 }
-- 
cgit v1.2.3