Better controlling when OnClose is cleared

Author: StanleyGoldman

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

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

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

@@ -83,6 +83,12 @@ public override void Refresh()
             ActiveView.Refresh();
         }
 
+        protected override void RaiseOnClose(bool result)
+        {
+            base.RaiseOnClose(result);
+            ClearOnClose();
+        }
+
         public override void OnSelectionChange()
         {
             base.OnSelectionChange();