should help race conditionsv0.22.54v0.22.53v0.22.52v0.22.51v0.22.50v0.22.49v0.22.48v0.22.47v0.22.46v0.22.45v0.22.44v0.22.43v0.22.42v0.22.41

1 files changed, 10 insertions, 0 deletions

diff --git a/windowMerge.go b/windowMerge.go
index a407995..5bfb737 100644
--- a/windowMerge.go
+++ b/windowMerge.go
@@ -103,6 +103,8 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
 	grid.NextRow()
 
 	grid.NewButton("checkout user", func() {
+		w.Disable()
+		defer w.Enable()
 		if err := repo.CheckoutUser(); err != nil {
 			log.Info(repo.GetFullPath(), err)
 		}
@@ -111,11 +113,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
 	})
 	grid.NextRow()
 	grid.NewButton("checkout devel", func() {
+		w.Disable()
+		defer w.Enable()
 		repo.CheckoutDevel()
 		w.repo.Reload()
 		w.Update()
 	})
 	w.mergeD = grid.NewButton("merge to devel", func() {
+		w.Disable()
+		defer w.Enable()
 		log.Info("repo:", repo.GetGoPath())
 		if result, err := repo.MergeToDevel(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())
@@ -140,11 +146,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
 	})
 	grid.NextRow()
 	grid.NewButton("checkout master", func() {
+		w.Disable()
+		defer w.Enable()
 		repo.CheckoutMaster()
 		w.repo.Reload()
 		w.Update()
 	})
 	w.mergeM = grid.NewButton("merge to master", func() {
+		w.Disable()
+		defer w.Enable()
 		log.Info("repo:", repo.GetGoPath())
 		if result, err := repo.MergeToMaster(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())