Merge pull request reactiveui#826 from nsainaney/master

Possible fix for issue reactiveui#746
rainlabs-eu · Apr 6, 2015 · 63f1401 · 63f1401
2 parents caaae3a + e2cf7bf
commit 63f1401
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ReactiveUI/WeakEventManager.cs b/ReactiveUI/WeakEventManager.cs
@@ -279,7 +279,11 @@ public bool Matches(object source, TEventHandler handler)
                 return this.source != null && 
                     Object.ReferenceEquals(this.source.Target, source) && 
                     this.originalHandler != null && 
-                    Object.ReferenceEquals(this.originalHandler.Target, handler);
+                    (Object.ReferenceEquals(this.originalHandler.Target, handler) ||
+                    (this.originalHandler.Target is PropertyChangedEventHandler &&
+                    handler is PropertyChangedEventHandler &&
+                    object.Equals((this.originalHandler.Target as PropertyChangedEventHandler).Target,
+                        (handler as PropertyChangedEventHandler).Target)));
             }
         }