Skip to content

Commit

Permalink
don't compile WeakEventHandler add/remove
Browse files Browse the repository at this point in the history
  • Loading branch information
tibel committed Jun 14, 2014
1 parent c6001f4 commit d90b90c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build/Weakly.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<metadata>
<id>Weakly</id>
<title>Weakly</title>
<version>2.1.3</version>
<version>2.1.4</version>
<authors>Thomas Ibel</authors>
<description>Weakly is a collection of some useful weak-reference types available as portable class library for net45+win8+wp8+wpa81.</description>
<language>en-US</language>
<licenseUrl>https://raw.github.com/tibel/Weakly/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/tibel/Weakly</projectUrl>
<iconUrl>https://raw.github.com/tibel/Weakly/master/build/weakly_icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes>Add check for Windows Runtime type.</releaseNotes>
<releaseNotes>Optimizations</releaseNotes>
<copyright>Copyright Thomas Ibel 2013-2014</copyright>
<tags>
Weakly WeakReference WeakAction WeakFunc WeakDelegate WeakCollection WeakValueDictionary WeakEventHandler WeakEventSource DynamicDelegate
Expand Down
2 changes: 1 addition & 1 deletion src/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
[assembly: CLSCompliant(true)]

[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.3.0")]
[assembly: AssemblyFileVersion("2.1.4.0")]
8 changes: 3 additions & 5 deletions src/Weakly/Events/WeakEventHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,10 @@ public WeakEventHandlerImpl(object eventSource, EventInfo eventInfo, Action<obje
.CreateDelegate(eventInfo.EventHandlerType, this);

// register weak handler
var addMethod = DynamicEvent.GetAddMethod(eventInfo);
addMethod(eventSource, _eventHandler);
_eventInfo.AddEventHandler(eventSource, _eventHandler);
}

public void Invoke(object sender, TEventArgs args)
private void Invoke(object sender, TEventArgs args)
{
var target = _target.Target;
if (target != null)
Expand All @@ -124,8 +123,7 @@ public void Dispose()
if (!isStatic && eventSource == null)
return;

var removeMethod = DynamicEvent.GetRemoveMethod(_eventInfo);
removeMethod(eventSource, _eventHandler);
_eventInfo.RemoveEventHandler(eventSource, _eventHandler);
_disposed = true;
}
}
Expand Down

0 comments on commit d90b90c

Please sign in to comment.