Auto close windows

GitUI/FormArchive.Designer.cs

@@ -38,6 +38,7 @@
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
             this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -52,7 +53,7 @@
             // 
             // Save
             // 
-            this.Save.Location = new System.Drawing.Point(753, 271);
+            this.Save.Location = new System.Drawing.Point(753, 6);
             this.Save.Name = "Save";
             this.Save.Size = new System.Drawing.Size(75, 23);
             this.Save.TabIndex = 3;
@@ -90,6 +91,10 @@
             // splitContainer2.Panel1
             // 
             this.splitContainer2.Panel1.Controls.Add(this.revisionGrid1);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.Save);
             this.splitContainer2.Size = new System.Drawing.Size(831, 271);
             this.splitContainer2.SplitterDistance = 235;
             this.splitContainer2.TabIndex = 0;
@@ -111,7 +116,6 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(831, 300);
-            this.Controls.Add(this.Save);
             this.Controls.Add(this.splitContainer1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FormArchive";
@@ -122,6 +126,7 @@
             this.splitContainer1.Panel2.ResumeLayout(false);
             this.splitContainer1.ResumeLayout(false);
             this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
             this.splitContainer2.ResumeLayout(false);
             this.ResumeLayout(false);
 

GitUI/FormBranch.cs

@@ -28,7 +28,8 @@ namespace GitUI
 
                 new FormProcess(GitCommands.GitCommands.BranchCmd(BName.Text, RevisionGrid.GetRevisions()[0].Guid, ChechoutAfterCreate.Checked));
 
-                RevisionGrid.RefreshRevisions();
+                Close();
+
             }
             catch
             {

GitUI/FormClone.cs

@@ -30,6 +30,9 @@ namespace GitUI
 
                 FormProcess fromProcess;
                 fromProcess = new FormProcess(Settings.GitDir + "git.cmd", GitCommands.GitCommands.CloneCmd(From.Text, To.Text, CentralRepository.Checked));
+
+                if (!GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && !GitCommands.GitCommands.InTheMiddleOfRebase() && !GitCommands.GitCommands.InTheMiddleOfPatch())
+                    Close();
             }
             catch
             {

GitUI/FormDeleteBranch.cs

@@ -34,6 +34,7 @@ namespace GitUI
             catch
             {
             }
+            Close();
         }
     }
 }

GitUI/FormGitIgnore.cs

@@ -40,6 +40,7 @@ namespace GitUI
             TextWriter tw = new StreamWriter(Settings.WorkingDir + ".gitignore", false);
             tw.Write(GitIgnoreFile);
             tw.Close();
+            Close();
 
         }
 

GitUI/FormInit.cs

@@ -36,6 +36,8 @@ namespace GitUI
             MessageBox.Show(GitCommands.GitCommands.Init(Central.Checked, Central.Checked), "Initialize new repository");
 
             RepositoryHistory.AddMostRecentRepository(Directory.Text);
+            
+            Close();
         }
 
         private void Browse_Click(object sender, EventArgs e)

GitUI/FormMailMap.cs

@@ -38,6 +38,7 @@ namespace GitUI
             TextWriter tw = new StreamWriter(Settings.WorkingDir + ".mailmap", false);
             tw.Write(MailMapFile);
             tw.Close();
+            Close();
         }
 
         private void FormMailMap_Load(object sender, EventArgs e)

GitUI/FormPull.cs

@@ -152,6 +152,9 @@ namespace GitUI
                 }
             }
 
+            if (!GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && !GitCommands.GitCommands.InTheMiddleOfRebase())
+                Close();
+
         }
 
         private void FormPull_Load(object sender, EventArgs e)

GitUI/FormPush.cs

@@ -55,6 +55,9 @@ namespace GitUI
                 form = new FormProcess(GitCommands.Settings.GitDir + "git.cmd", GitCommands.GitCommands.PushCmd(Remotes.Text, Branch.Text, PushAllBranches.Checked), Remotes.Text.Trim());
                 //form = new FormProcess(GitCommands.Settings.GitLibexecDir + "git-push.exe", "\"" + Remotes.Text.Trim() + "\" " + Branch.Text);
             }
+
+            if (!GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && !GitCommands.GitCommands.InTheMiddleOfRebase())
+                Close();
         }
 
         private void PushDestination_DropDown(object sender, EventArgs e)

GitUI/FormRebase.cs

@@ -128,6 +128,9 @@ namespace GitUI
 
             EnableButtons();
             patchGrid1.Initialize();
+
+            if (!GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && !GitCommands.GitCommands.InTheMiddleOfRebase() && !GitCommands.GitCommands.InTheMiddleOfPatch())
+                Close();
         }
 
         private void SolveMergeconflicts_Click(object sender, EventArgs e)

GitUI/FormTag.cs

@@ -33,7 +33,7 @@ namespace GitUI
 
                 MessageBox.Show("Command executed \n" + GitCommands.GitCommands.Tag(Tagname.Text, GitRevisions.GetRevisions()[0].Guid), "Tag");
 
-                GitRevisions.RefreshRevisions();
+                Close();
             }
             catch
             {

GitUI/MergePatch.cs

@@ -114,6 +114,9 @@ namespace GitUI
                 new FormProcess(GitCommands.GitCommands.PatchCmd(PatchDir.Text + "\\*.patch"));
 
             EnableButtons();
+
+            if (!GitCommands.GitCommands.InTheMiddleOfConflictedMerge() && !GitCommands.GitCommands.InTheMiddleOfRebase() && !GitCommands.GitCommands.InTheMiddleOfPatch())
+                Close();
         }
 
         private void Mergetool_Click(object sender, EventArgs e)