Commit 4e0b76d8 authored by Timur Pocheptsov's avatar Timur Pocheptsov
Browse files

Cocoa integration - avoid dangling menuitem pointer


Since QCocoaMenu can live longer than its m_attachedItem pointer,
this pointer is becoming invalid after QCocoaMenuItem deleted
(and its 'm_native' was released).

Task-number: QTBUG-53251
Change-Id: I6d97b75b2c09e2443cd21415c5db94206d5d89ce
Reviewed-by: default avatarFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: default avatarGabriel de Dietrich <gabriel.dedietrich@qt.io>
Showing with 2 additions and 0 deletions
......@@ -110,6 +110,8 @@ QCocoaMenuItem::~QCocoaMenuItem()
if (m_merged) {
[m_native setHidden:YES];
} else {
if (m_menu && m_menu->attachedItem() == m_native)
m_menu->setAttachedItem(nil);
[m_native release];
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment