dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed more edge cases

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-21 20:32:42 +01:00
parent 1190303044
commit 83fef5e399
18 changed files with 153 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Foundation/Subscription.cs
+4 -5
View File
@@ -21,7 +21,7 @@ public class Subscription(SubscriptionCollection subscriptions,
return collection;
});
disposer.Add(subscriber, Disposable.Create(() => RemoveSubscriber(subscriber, argumentType)));
disposer.Add(subscriber, Disposable.Create(() => RemoveSubscriber(subscriber, subscriptionKey)));
}
}
}
@@ -51,10 +51,9 @@ public class Subscription(SubscriptionCollection subscriptions,
private void RemoveSubscriber(object subscriber,
Type argumentType)
string key)
{
string subscriptionKey = $"{argumentType}";
if (subscriptions.TryGetValue(subscriptionKey, out List<WeakReference>? subscribers))
if (subscriptions.TryGetValue(key, out List<WeakReference>? subscribers))
{
for (int i = subscribers.Count - 1; i >= 0; i--)
{
@@ -66,7 +65,7 @@ public class Subscription(SubscriptionCollection subscriptions,
if (subscribers.Count == 0)
{
subscriptions.TryRemove(subscriptionKey, out _);
subscriptions.TryRemove(key, out _);
}
}
}