From 2ee611a76b339c3fc256f21a9998364866f78e47 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 20 十一月 2018 19:10:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/WindowBase/WindowAsyncLoad.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/System/WindowBase/WindowAsyncLoad.cs b/System/WindowBase/WindowAsyncLoad.cs
index 28a7e99..276bdbd 100644
--- a/System/WindowBase/WindowAsyncLoad.cs
+++ b/System/WindowBase/WindowAsyncLoad.cs
@@ -91,7 +91,7 @@
                 {
                     try
                     {
-                        if (currentTask != null)
+                        if (_resource != null && currentTask != null && currentTask.windowName == _resource.name)
                         {
                             currentTask.Report(ok, _resource);
                             currentTask = null;

--
Gitblit v1.8.0