Merge pull request #102 from timothylcooke/master-v2

Fixes for #101
rafallopatka · Nov 27, 2019 · 95ab84f · 95ab84f
2 parents f3603b9 + f2c83d5
commit 95ab84f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Src/ToastNotifications/Lifetime/Clear/ClearByTag.cs b/Src/ToastNotifications/Lifetime/Clear/ClearByTag.cs
@@ -16,8 +16,19 @@ public ClearByTag(object tag)
         public IEnumerable<INotification> GetNotificationsToRemove(NotificationsList notifications)
         {
             var notificationsToRemove = notifications
-                .Where(x => x.Value.Notification.Options.Tag.Equals(_tag))
                 .Select(x => x.Value.Notification)
+                .Where(x =>
+                {
+                    object otherTag = x.Options.Tag;
+                    if (ReferenceEquals(otherTag, null))
+                    {
+                        return ReferenceEquals(_tag, null);
+                    }
+                    else
+                    {
+                        return otherTag.Equals(_tag);
+                    }
+                })
                 .ToList();
 
             return notificationsToRemove;