Stop listening for IsCancel on button detached

4 years ago · 2a2779f248
1 changed files with 7 additions and 0 deletions
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@ -232,6 +232,13 @@ namespace Avalonia.Controls
                    StopListeningForDefault(inputElement);
                }
            }
+            if (IsCancel)
+            {
+                if (e.Root is IInputElement inputElement)
+                {
+                    StopListeningForCancel(inputElement);
+                }
+            }
        }

        /// <inheritdoc/>