Clearing onClose and Raising it before opening a window

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs

@@ -52,11 +52,13 @@ public virtual void Finish(bool result)
         {
             finishCalled = true;
             RaiseOnClose(result);
+            OnClose = null;
         }
 
         protected void RaiseOnClose(bool result)
         {
             OnClose.SafeInvoke(result);
+            OnClose = null;
         }
 
         public virtual void Awake()

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs

@@ -29,6 +29,9 @@ public static void Launch()
         public static PopupWindow Open(PopupViewType popupViewType, Action<bool> onClose = null)
         {
             var popupWindow = GetWindow<PopupWindow>(true);
+
+            popupWindow.RaiseOnClose(false);
+
             if (onClose != null)
             {
                 popupWindow.OnClose += onClose;