From 475ccc9f21022ce66981effcedf8de339fc98a2f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 21 十月 2021 11:15:31 +0800 Subject: [PATCH] Merge branch 'WJC' into wxr7 --- HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs index ffff590..33dacc8 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs @@ -513,7 +513,11 @@ if (showedTime.AddSeconds(30) > DateTime.Now) { thread.Abort(); - waitPage.RemoveFromParent(); + if (waitPage != null) + { + waitPage.RemoveFromParent(); + waitPage = null; + } } }; thread.Start(); -- Gitblit v1.8.0