github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add more guards around null notification

Browse Source
This commit is contained in:
Kevin Sawicki
2016-10-28 10:54:55 -07:00
parent ee4442f964
commit 0a5f7171d4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
brightray/browser/mac/cocoa_notification.mm
View File

@@ -57,8 +57,9 @@ void CocoaNotification::Show(const base::string16& title,
}
void CocoaNotification::Dismiss() {
[NSUserNotificationCenter.defaultUserNotificationCenter
removeDeliveredNotification:notification_];
if (notification_)
[NSUserNotificationCenter.defaultUserNotificationCenter
removeDeliveredNotification:notification_];
NotificationDismissed();
}

11
brightray/browser/platform_notification_service.cc
View File

@@ -26,12 +26,13 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
const content::PlatformNotificationData& data,
bool audio_muted,
bool allowed) {
if (!allowed) {
notification->Destroy();
if (!notification)
return;
}
notification->Show(data.title, data.body, data.tag, data.icon, icon,
audio_muted ? true : data.silent);
if (allowed)
notification->Show(data.title, data.body, data.tag, data.icon, icon,
audio_muted ? true : data.silent);
else
notification->Destroy();
}
} // namespace