1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
index 464c16d66f..db64702b8d 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -118,11 +118,13 @@ class QSystemTrayIconSys
 public:
     QSystemTrayIconSys(QCocoaSystemTrayIcon *sys) {
         item = [[QNSStatusItem alloc] initWithSysTray:sys];
-        [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:item];
+        NSUserNotificationCenter.defaultUserNotificationCenter.delegate = item;
     }
     ~QSystemTrayIconSys() {
         [[[item item] view] setHidden: YES];
-        [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:nil];
+        NSUserNotificationCenter *center = NSUserNotificationCenter.defaultUserNotificationCenter;
+        if (center.delegate == item)
+            center.delegate = nil;
         [item release];
     }
     QNSStatusItem *item;
@@ -277,7 +279,10 @@ void QCocoaSystemTrayIcon::showMessage(const QString &title, const QString &mess
         notification.contentImage = [nsimage autorelease];
     }
 
-    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+    NSUserNotificationCenter *center = NSUserNotificationCenter.defaultUserNotificationCenter;
+    center.delegate = m_sys->item;
+    [center deliverNotification:notification];
+    [notification release];
 }
 QT_END_NAMESPACE