Merge pull request #20 from desktop/fix-terminate-notifications

desktop · Jun 6, 2022 · 11a4b9a · 11a4b9a
2 parents dbe412f + d79fc83
commit 11a4b9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/sample-app/main.ts b/sample-app/main.ts
@@ -8,6 +8,7 @@ import {
   onNotificationEvent,
   requestNotificationsPermission,
   getNotificationSettingsUrl,
+  terminateNotifications,
 } from 'desktop-notifications'
 
 const createWindow = () => {
@@ -29,6 +30,9 @@ const createWindow = () => {
     })
   )
   win.webContents.openDevTools()
+  win.on('closed', () => {
+    terminateNotifications()
+  })
   return win
 }
 

diff --git a/src/mac/main_mac.mm b/src/mac/main_mac.mm
@@ -166,6 +166,13 @@
     return deferred.Promise();
   }
 
+  Napi::Value terminateNotifications(const Napi::CallbackInfo &info)
+  {
+    const Napi::Env &env = info.Env();
+    desktopNotificationsManager = nil;
+    return env.Undefined();
+  }
+
   Napi::Value closeNotification(const Napi::CallbackInfo &info)
   {
     const Napi::Env &env = info.Env();
@@ -254,9 +261,9 @@
   Napi::Object Init(Napi::Env env, Napi::Object exports)
   {
     exports.Set(Napi::String::New(env, "initializeNotifications"), Napi::Function::New(env, initializeNotifications));
+    exports.Set(Napi::String::New(env, "terminateNotifications"), Napi::Function::New(env, terminateNotifications));
     exports.Set(Napi::String::New(env, "showNotification"), Napi::Function::New(env, showNotification));
     exports.Set(Napi::String::New(env, "closeNotification"), Napi::Function::New(env, closeNotification));
-    exports.Set(Napi::String::New(env, "requestNotificationsPermission"), Napi::Function::New(env, requestNotificationsPermission));
     exports.Set(Napi::String::New(env, "getNotificationsPermission"), Napi::Function::New(env, getNotificationsPermission));
     exports.Set(Napi::String::New(env, "requestNotificationsPermission"), Napi::Function::New(env, requestNotificationsPermission));
 

diff --git a/src/win/DesktopNotificationsManager.cpp b/src/win/DesktopNotificationsManager.cpp
@@ -133,11 +133,6 @@ HRESULT DesktopNotificationsManager::RegisterClassObjects(const std::wstring &to
 DesktopNotificationsManager::~DesktopNotificationsManager()
 {
     m_callback.Release();
-
-    for (auto n : m_desktopNotifications)
-    {
-        closeNotification(n);
-    }
     m_desktopNotifications.clear();
 
     UnregisterClassObjects();