go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-31 22:22:14 +02:00
Code Issues Releases Activity

Intro message stays on screen now

Browse Source
This commit is contained in:
mjarkk 2018-12-07 19:22:22 +01:00
parent 2f7bd2896c
commit cf5a85b80f
1 changed files with 9 additions and 0 deletions

9
pkg/gui/gui.go

@ -1,6 +1,7 @@
package gui package gui
import ( import (
"sync"
// "io" // "io"
// "io/ioutil" // "io/ioutil"
@ -72,6 +73,7 @@ type Gui struct {
Updater *updates.Updater Updater *updates.Updater
statusManager *statusManager statusManager *statusManager
credentials credentials credentials credentials
introAgree sync.WaitGroup
} }
type stagingState struct { type stagingState struct {
@ -365,8 +367,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
func (gui *Gui) promptAnonymousReporting() error { func (gui *Gui) promptAnonymousReporting() error {
return gui.createConfirmationPanel(gui.g, nil, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error { return gui.createConfirmationPanel(gui.g, nil, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error {
gui.introAgree.Done()
return gui.Config.WriteToUserConfig("reporting", "on") return gui.Config.WriteToUserConfig("reporting", "on")
}, func(g *gocui.Gui, v *gocui.View) error { }, func(g *gocui.Gui, v *gocui.View) error {
gui.introAgree.Done()
return gui.Config.WriteToUserConfig("reporting", "off") return gui.Config.WriteToUserConfig("reporting", "off")
}) })
} }
@ -443,9 +447,14 @@ func (gui *Gui) Run() error {
return err return err
} }
if gui.Config.GetUserConfig().GetString("reporting") == "undetermined" {
gui.introAgree.Add(1)
}
go func() { go func() {
_, err := gui.fetch(g, g.CurrentView(), false) _, err := gui.fetch(g, g.CurrentView(), false)
if err != nil && strings.Contains(err.Error(), "exit status 128") && gui.canShowIsPrivateRepo() { if err != nil && strings.Contains(err.Error(), "exit status 128") && gui.canShowIsPrivateRepo() {
gui.introAgree.Wait()
_ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil) _ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
} else { } else {
gui.goEvery(g, time.Second*60, func(g *gocui.Gui) error { gui.goEvery(g, time.Second*60, func(g *gocui.Gui) error {