Merge pull request #2 from Vjacheslaw/master-v2

Bug fix:
WaldemarCoding · Apr 7, 2020 · 63927e8 · 63927e8
2 parents 95ab84f + e6101f6
commit 63927e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Src/ToastNotifications/Display/NotificationsDisplaySupervisor.cs b/Src/ToastNotifications/Display/NotificationsDisplaySupervisor.cs
@@ -65,6 +65,13 @@ private void InternalClose(INotification notification)
             UpdateWindowPosition();
         }
 
+        public INotification CreateNotification<T>(Func<T> createNotificationFunc)
+            where T : INotification
+        {
+            return
+                (T)_dispatcher.Invoke(createNotificationFunc);
+        }
+
         private void Dispatch(Action action)
         {
             _dispatcher.Invoke(action);
@@ -120,9 +127,13 @@ private void CloseNotification(INotification notification)
         {
             if (notification != null)
             {
-                notification.DisplayPart.OnClose();
-                DelayAction.Execute(TimeSpan.FromMilliseconds(300), 
-                    () => _window?.CloseNotification(notification.DisplayPart),
+                DelayAction.Execute(
+                    TimeSpan.FromMilliseconds(300), 
+                    () =>
+                    {
+                        notification.DisplayPart.OnClose();
+                        _window?.CloseNotification(notification.DisplayPart);
+                    },
                     _dispatcher);
             }
         }

diff --git a/Src/ToastNotifications/Notifier.cs b/Src/ToastNotifications/Notifier.cs
@@ -28,7 +28,9 @@ public void Notify<T>(Func<T> createNotificationFunc)
             where T: INotification
         {
             Configure();
-            _lifetimeSupervisor.PushNotification(createNotificationFunc());
+            var notification = _displaySupervisor.CreateNotification(createNotificationFunc);
+
+            _lifetimeSupervisor.PushNotification(notification);
         }
 
         private void Configure()