From 464523f318196e7a3d40641ec5e3de84f2562e87 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 3 Jan 2021 23:38:30 +0100 Subject: [PATCH] Add missing control reference clear --- Source/Editor/GUI/ContextMenu/ContextMenuBase.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs index 42ce0446d..6caf7f651 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs @@ -224,8 +224,12 @@ namespace FlaxEditor.GUI.ContextMenu } // Return focus - _previouslyFocused?.RootWindow?.Focus(); - _previouslyFocused?.Focus(); + if (_previouslyFocused != null) + { + _previouslyFocused.RootWindow?.Focus(); + _previouslyFocused.Focus(); + _previouslyFocused = null; + } // Hide Visible = false;