diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 8a87be27..46ff6212 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -1317,11 +1317,14 @@ namespace WebSocketSharp /// The type of the event data generated by the event. /// public static void Emit ( - this EventHandler eventHandler, object sender, TEventArgs e) + this EventHandler eventHandler, object sender, TEventArgs e + ) where TEventArgs : EventArgs { - if (eventHandler != null) - eventHandler (sender, e); + if (eventHandler == null) + return; + + eventHandler (sender, e); } ///