From 001df6eb6c45e9d19c8f2b8a3ade309be149914d Mon Sep 17 00:00:00 2001 From: yasirkula Date: Tue, 4 Jan 2022 23:24:30 +0300 Subject: [PATCH] Fixed locked AssetUsageDetector windows entering an inconsistent state after relaunching the editor --- .../AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index c53a7e2..0665cb3 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -46,6 +46,8 @@ namespace AssetUsageDetectorNamespace // This isn't readonly so that it can be serialized private List objectsToSearch = new List() { new ObjectToSearch( null ) }; +#pragma warning disable 0649 + [SerializeField] // Since titleContent persists between Editor sessions, so should the IsLocked property because otherwise, "[L]" in title becomes confusing when the EditorWindow isn't actually locked private bool m_isLocked; private bool IsLocked { @@ -59,6 +61,7 @@ namespace AssetUsageDetectorNamespace } } } +#pragma warning restore 0649 private Phase currentPhase = Phase.Setup; @@ -166,6 +169,8 @@ namespace AssetUsageDetectorNamespace if( window && ( filter == WindowFilter.AlwaysReturnActive || ( !window.IsLocked && filter == WindowFilter.ReturnActiveIfNotLocked ) ) ) { window.Show(); + window.Focus(); + return window; } @@ -188,6 +193,8 @@ namespace AssetUsageDetectorNamespace } window.Show( true ); + window.Focus(); + return window; }