diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-08-28 20:38:20 +0700 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-08-28 13:45:41 +0000 |
commit | 48784486a36f60dea882baabc6923f4b59d2bfe6 (patch) | |
tree | decb171c93ce9d3cfdd5489a99ee6d3125a08c18 /src/plugins | |
parent | ea168ead1a5ac24f540895f18fa88ab27d8e6c3a (diff) | |
download | qtbase-48784486a36f60dea882baabc6923f4b59d2bfe6.tar.gz |
QCocoaMenu: Stop update timer
This amends patch f27d1ccbb24ec2fd4098f2976503478831006cc8.
Change-Id: I4c7a390a5f2cdd3307007c7b6708692c36f861b4
Task-number: QTBUG-62396
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index d7f0efe86c..3a11023a4d 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -427,6 +427,7 @@ void QCocoaMenu::scheduleUpdate() void QCocoaMenu::timerEvent(QTimerEvent *e) { if (e->timerId() == m_updateTimer) { + killTimer(m_updateTimer); m_updateTimer = 0; [m_nativeMenu update]; } |