From 01edb8c8b128318a3c12d85be433af429dd1639f Mon Sep 17 00:00:00 2001
From: Adir <adirh3@gmail.com>
Date: Wed, 7 Oct 2020 19:25:18 +0300
Subject: [PATCH] Added potential fix for hotkey manager instances not clearing
 up after detaching from root

---
 src/Avalonia.Controls/HotkeyManager.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/HotkeyManager.cs b/src/Avalonia.Controls/HotkeyManager.cs
index 95752e7875..9a2b4f2d0a 100644
--- a/src/Avalonia.Controls/HotkeyManager.cs
+++ b/src/Avalonia.Controls/HotkeyManager.cs
@@ -55,6 +55,11 @@ namespace Avalonia.Controls
 
             private void OnParentChanged(TopLevel control)
             {
+                if (control == null)
+                {
+                    Stop();
+                    return;
+                }
                 Unregister();
                 _root = control;
                 Register();