1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00

do not put mutexes on state else we might unlock an unlocked mutex

This commit is contained in:
Jesse Duffield
2020-10-07 21:45:57 +11:00
parent 79e59d5460
commit 795e4da8b8
7 changed files with 20 additions and 19 deletions

View File

@ -81,11 +81,11 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
}
func (gui *Gui) refreshFilesAndSubmodules() error {
gui.State.Mutexes.RefreshingFilesMutex.Lock()
gui.Mutexes.RefreshingFilesMutex.Lock()
gui.State.IsRefreshingFiles = true
defer func() {
gui.State.IsRefreshingFiles = false
gui.State.Mutexes.RefreshingFilesMutex.Unlock()
gui.Mutexes.RefreshingFilesMutex.Unlock()
}()
selectedFile := gui.getSelectedFile()
@ -517,8 +517,8 @@ func (gui *Gui) pullFiles(opts PullFilesOptions) error {
}
func (gui *Gui) pullWithMode(mode string, opts PullFilesOptions) error {
gui.State.Mutexes.FetchMutex.Lock()
defer gui.State.Mutexes.FetchMutex.Unlock()
gui.Mutexes.FetchMutex.Lock()
defer gui.Mutexes.FetchMutex.Unlock()
err := gui.GitCommand.Fetch(
commands.FetchOptions{