From 78f4ae3a03b291ee7716d964fc796ffa56c2174e Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Sun, 10 Nov 2019 17:03:24 +0300
Subject: [PATCH] [view] popup close fix

---
 src/main/haxework/view/popup/PopupView.hx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/haxework/view/popup/PopupView.hx b/src/main/haxework/view/popup/PopupView.hx
index 42709fa..a1eade9 100755
--- a/src/main/haxework/view/popup/PopupView.hx
+++ b/src/main/haxework/view/popup/PopupView.hx
@@ -56,20 +56,22 @@ class PopupView<R> extends GroupView {
     }
 
     public function close(result:R):Void {
+        var d = deferred;
+        deferred = null;
         manager.close(this);
         onClose();
-        if (deferred != null) {
-            deferred.resolve(result);
-            deferred = null;
+        if (d != null) {
+            d.resolve(result);
         }
     }
 
     public function reject(reason:Dynamic):Void {
+        var d = deferred;
+        deferred = null;
         manager.close(this);
-        if (deferred != null) {
-            //deferred.throwError(reason);
-            deferred.resolve(null);
-            deferred = null;
+        if (d != null) {
+            //d.throwError(reason);
+            d.resolve(null);
         }
     }
 }