diff --git a/src/NTwain/TwainSession.MsgHandling.cs b/src/NTwain/TwainSession.MsgHandling.cs index b2c59de..7367218 100644 --- a/src/NTwain/TwainSession.MsgHandling.cs +++ b/src/NTwain/TwainSession.MsgHandling.cs @@ -22,7 +22,7 @@ namespace NTwain var rc = DGControl.DeviceEvent.Get(ref de); if (rc == ReturnCode.Success) { - OnDeviceEvent(new DeviceEventArgs { Data = de }); + OnDeviceEventReceived(new DeviceEventArgs { Data = de }); } break; case Message.XferReady: diff --git a/src/NTwain/TwainSession.Props.cs b/src/NTwain/TwainSession.Props.cs index 687f485..17f6ffd 100644 --- a/src/NTwain/TwainSession.Props.cs +++ b/src/NTwain/TwainSession.Props.cs @@ -48,21 +48,19 @@ namespace NTwain public DGCustom DGCustom { get; set; } - - /// /// Occurs when the source has generated an event. /// - public event EventHandler DeviceEvent; + public event EventHandler DeviceEventReceived; /// - /// Raises the event. + /// Raises the event. /// /// - protected virtual void OnDeviceEvent(DeviceEventArgs e) + protected virtual void OnDeviceEventReceived(DeviceEventArgs e) { - OnDeviceEvent(e); - DeviceEvent?.Invoke(this, e); + var handler = DeviceEventReceived; + handler?.Invoke(this, e); } @@ -79,8 +77,8 @@ namespace NTwain /// Name of the property. protected void RaisePropertyChanged(string propertyName) { - var handle = PropertyChanged; - handle?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + var handler = PropertyChanged; + handler?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } } }