From 09362840e9d2117f512e2ea83ab4b952ead4a90b Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 14 Jan 2024 15:43:47 -0600 Subject: blocks double clicking on processing git commands Signed-off-by: Jeff Carr --- draw.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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") -- cgit v1.2.3