Fix crash when dropdown is removed from hierarchy during select

ppy · May 27, 2024 · 3b26686 · 3b26686
1 parent eafc2f4
commit 3b26686
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/UserInterface/Dropdown.cs b/osu.Framework/Graphics/UserInterface/Dropdown.cs
@@ -839,9 +839,9 @@ void IDropdown.CommitPreselection()
             SelectedItem = (DropdownMenuItem<T>)preselectedItem.Item;
         }
 
-        void IDropdown.TriggerFocusContention(Drawable triggerSource) => GetContainingFocusManager().TriggerFocusContention(triggerSource);
+        void IDropdown.TriggerFocusContention(Drawable triggerSource) => GetContainingFocusManager()?.TriggerFocusContention(triggerSource);
 
-        bool IDropdown.ChangeFocus(Drawable potentialFocusTarget) => GetContainingFocusManager().ChangeFocus(potentialFocusTarget);
+        bool IDropdown.ChangeFocus(Drawable potentialFocusTarget) => GetContainingFocusManager()?.ChangeFocus(potentialFocusTarget) ?? false;
 
         #endregion
     }