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 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); } } }