blocks double clicking on processing git commandsv0.12.5

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 2 insertions, 1 deletions

diff --git a/draw.go b/draw.go
index 14b00ab..f152955 100644
--- a/draw.go
+++ b/draw.go
@@ -101,6 +101,7 @@ func (rs *RepoStatus) drawGitCommands() {
 
 	label := "merge devel to " + rs.masterDrop.Get()
 	rs.develMerge = newgrid.NewButton(label, func() {
+		rs.develMerge.Disable()
 		master := rs.masterDrop.Get()
 		rs.checkoutBranch("master", master)
 		if rs.getCurrentBranchName() != master {
@@ -111,7 +112,6 @@ func (rs *RepoStatus) drawGitCommands() {
 			log.Warn("SOMETHING WENT WRONG")
 			return
 		}
-		rs.develMerge.Disable() // don't let this run twice for now
 		rs.Update()
 		log.Warn("THINGS SEEM OK")
 	})
@@ -306,6 +306,7 @@ func (rs *RepoStatus) runGitCommands() bool {
 	for _, line := range rs.versionCmds {
 		s := strings.Join(line, " ")
 		log.Warn("NEED TO RUN:", s)
+		rs.develMerge.SetText(s)
 		err, b, output := runCmd(rs.repopath, line)
 		if err != nil {
 			log.Warn("ABEND EXECUTION")