summaryrefslogtreecommitdiffstats
path: root/pkg/gui/git_flow.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-04-02 21:30:39 +1100
committerJesse Duffield <jessedduffield@gmail.com>2021-04-06 19:34:32 +1000
commit69e9f6d29da5be2d6250444ee46b05c81d668d8e (patch)
tree9293828c293d715101b6a9e03da11bbf4017be6b /pkg/gui/git_flow.go
parent0b424370524cbc95a5526545f17543a41badcab1 (diff)
use suspense rather than close the gui when switching to a subprocess
Diffstat (limited to 'pkg/gui/git_flow.go')
-rw-r--r--pkg/gui/git_flow.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/gui/git_flow.go b/pkg/gui/git_flow.go
index 4440c6ebd..6af93794c 100644
--- a/pkg/gui/git_flow.go
+++ b/pkg/gui/git_flow.go
@@ -31,9 +31,9 @@ func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) err
return gui.createErrorPanel(gui.Tr.NotAGitFlowBranch)
}
- subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "finish", suffix)
- gui.SubProcess = subProcess
- return gui.Errors.ErrSubProcess
+ return gui.runSubprocessWithSuspense(
+ gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "finish", suffix),
+ )
}
func (gui *Gui) handleCreateGitFlowMenu() error {
@@ -55,9 +55,9 @@ func (gui *Gui) handleCreateGitFlowMenu() error {
return gui.prompt(promptOpts{
title: title,
handleConfirm: func(name string) error {
- subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "start", name)
- gui.SubProcess = subProcess
- return gui.Errors.ErrSubProcess
+ return gui.runSubprocessWithSuspense(
+ gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "start", name),
+ )
},
})
}