Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ internal virtual bool Validate(object value, ValidationStep validationStep)
ValidationError oldValidationError = GetValidationErrors(validationStep);

// ignore an error from the implicit DataError rule - this is checked
// separately (in BindingExpression.Validate).
// separately (in BindingExpression.Validate).
if (oldValidationError != null &&
oldValidationError.RuleInError == DataErrorValidationRule.Instance)
{
Expand Down Expand Up @@ -1484,6 +1484,15 @@ private void ProcessDirty()
{
if (IsUpdateOnPropertyChanged)
{
// cancel a pending UpdateTarget, so that it doesn't negate
// the effect of this change to the target value
DispatcherOperation op = (DispatcherOperation)GetValue(Feature.UpdateTargetOperation, null);
if (op != null)
{
ClearValue(Feature.UpdateTargetOperation);
op.Abort();
}

if (Helper.IsComposing(Target, TargetProperty))
{
// wait for the IME composition to complete
Expand Down