diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs index f9e09da..96d9c77 100644 --- a/NEG/UI/UnityUi/Area/MonoArea.cs +++ b/NEG/UI/UnityUi/Area/MonoArea.cs @@ -29,6 +29,8 @@ namespace NEG.UI.Area private void OnDestroy() { + if(UiManager.Instance == null) + return; if (ReferenceEquals(UiManager.Instance.CurrentArea, this)) UiManager.Instance.CurrentArea = null; } diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs index 7597334..6d9639e 100644 --- a/NEG/UI/UnityUi/Window/MonoWindow.cs +++ b/NEG/UI/UnityUi/Window/MonoWindow.cs @@ -27,7 +27,10 @@ namespace NEG.UI.UnityUi.Window private void OnDestroy() { - if (IsOpened) UiManager.Instance.OnWindowClosed(this); + if(UiManager.Instance == null) + return; + if (IsOpened) + UiManager.Instance.OnWindowClosed(this); } private void OnValidate()