diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2023-02-21 13:26:28 +0200 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@qt.io> | 2023-02-23 12:49:58 +0000 |
| commit | 8dfca2ee717289b334b7ec7a5a9cc9a3d8e9654a (patch) | |
| tree | 79dac36b70c28b4a08c88c8b972c4f1f5c096a03 | |
| parent | 2fffa21111824d41bf6831d8770e0a061bfee7fc (diff) | |
Fix crash with removed menus
Pick-to: 6.5 6.4 6.2
Fixes: QTBUG-111388
Change-Id: I9c9f0ad5cc02293197d7e77eeeec3ffa9d72a4af
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.mm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index 87eb3e1450..f46e5b3ed6 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -355,8 +355,11 @@ void QCocoaMenuBar::insertWindowMenu() QList<QCocoaMenuItem*> QCocoaMenuBar::merged() const { QList<QCocoaMenuItem*> r; - for (auto menu : std::as_const(m_menus)) + for (auto menu : std::as_const(m_menus)) { + if (!menu) + continue; r.append(menu->merged()); + } return r; } @@ -400,7 +403,7 @@ bool QCocoaMenuBar::shouldDisable(QCocoaWindow *active) const QPlatformMenu *QCocoaMenuBar::menuForTag(quintptr tag) const { for (auto menu : std::as_const(m_menus)) - if (menu->tag() == tag) + if (menu && menu->tag() == tag) return menu; return nullptr; @@ -408,10 +411,13 @@ QPlatformMenu *QCocoaMenuBar::menuForTag(quintptr tag) const NSMenuItem *QCocoaMenuBar::itemForRole(QPlatformMenuItem::MenuRole role) { - for (auto menu : std::as_const(m_menus)) - for (auto *item : menu->items()) - if (item->effectiveRole() == role) - return item->nsItem(); + for (auto menu : std::as_const(m_menus)) { + if (menu) { + for (auto *item : menu->items()) + if (item->effectiveRole() == role) + return item->nsItem(); + } + } return nil; } |