fix exception in menuitem extension

jinek · Nov 30, 2024 · f320cab · f320cab
1 parent ad9bc55
commit f320cab
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/MenuExtensions.cs b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/MenuExtensions.cs
@@ -38,13 +38,16 @@ static MenuExtensions()
                                     var focusedControl =
                                         (Control)AvaloniaLocator.Current.GetRequiredService<IFocusManager>()!
                                             .GetFocusedElement();
-                                    var menuItems = visual.GetLogicalAncestors().OfType<MenuItem>();
 
-                                    var focusedTree = focusedControl!.GetLogicalAncestors();
+                                    if (focusedControl != null)
+                                    {
+                                        var focusedTree = focusedControl.GetLogicalAncestors();
+                                        var menuItems = visual.GetLogicalAncestors().OfType<MenuItem>();
 
-                                    foreach (MenuItem menuItem in menuItems.Where(item => !focusedTree.Contains(item))
-                                                 .ToArray())
-                                        menuItem.Close();
+                                        foreach (MenuItem menuItem in menuItems.Where(item => !focusedTree.Contains(item))
+                                                     .ToArray())
+                                            menuItem.Close();
+                                    }
                                 });
                         }));
                     visual.SetValue(DisposablesProperty, new[] { disposable });