Make FormReflog use UICommands to display FormCreateBranch to get Pos…

…tRepositoryChanged event
gitextensions · Dec 7, 2018 · aeb633d · aeb633d
1 parent 6bad4b1
commit aeb633d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/GitUI/CommandsDialogs/FormReflog.cs b/GitUI/CommandsDialogs/FormReflog.cs
@@ -105,13 +105,13 @@ private void createABranchOnThisCommitToolStripMenuItem_Click(object sender, Eve
                 return;
             }
 
-            using (var form = new FormCreateBranch(UICommands, GetShaOfRefLine()))
+            var form = new FormCreateBranch(UICommands, GetShaOfRefLine())
             {
-                form.CheckoutAfterCreation = false;
-                form.UserAbleToChangeRevision = false;
-                form.CouldBeOrphan = false;
-                ShouldRefresh = form.ShowDialog(this) == DialogResult.OK;
-            }
+                CheckoutAfterCreation = false,
+                UserAbleToChangeRevision = false,
+                CouldBeOrphan = false
+            };
+            ShouldRefresh = UICommands.StartShowBranchDialog(ref form, this);
         }
 
         private ObjectId GetShaOfRefLine()

diff --git a/GitUI/GitUICommands.cs b/GitUI/GitUICommands.cs
@@ -372,6 +372,21 @@ bool Action()
             return DoActionOnRepo(owner, true, true, null, null, Action);
         }
 
+        public bool StartShowBranchDialog(ref FormCreateBranch formCreateBranch, IWin32Window owner = null)
+        {
+            var form = formCreateBranch;
+            formCreateBranch = null;
+            bool Action()
+            {
+                using (form)
+                {
+                    return form.ShowDialog(owner) == DialogResult.OK;
+                }
+            }
+
+            return DoActionOnRepo(owner, true, true, null, null, Action);
+        }
+
         public bool StartCloneDialog(IWin32Window owner, string url = null, bool openedFromProtocolHandler = false, EventHandler<GitModuleEventArgs> gitModuleChanged = null)
         {
             bool Action()