mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
brightray/browser/mac/cocoa_notification.mm
View file

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

7
brightray/browser/platform_notification_service.cc
View file

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