Browse Source

Merge pull request #10064 from AvaloniaUI/dont-process-events-when-toplevel-is-disposed

Don't process events when TopLevel is disposed.
codice/preview4-plus-10064
Max Katz 3 years ago
committed by Steven Kirk
parent
commit
02779b8318
  1. 17
      src/Avalonia.Controls/TopLevel.cs

17
src/Avalonia.Controls/TopLevel.cs

@ -527,12 +527,21 @@ namespace Avalonia.Controls
/// <param name="e">The event args.</param>
private void HandleInput(RawInputEventArgs e)
{
if (e is RawPointerEventArgs pointerArgs)
if (PlatformImpl != null)
{
pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
}
if (e is RawPointerEventArgs pointerArgs)
{
pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
}
_inputManager?.ProcessInput(e);
_inputManager?.ProcessInput(e);
}
else
{
Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
this,
"PlatformImpl is null, couldn't handle input.");
}
}
private void SceneInvalidated(object? sender, SceneInvalidatedEventArgs e)

Loading…
Cancel
Save