CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-10-21 20:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

hints kitten: Fix regression causing editing of favorites to sometimes hang

Browse source
This commit is contained in:
Kovid Goyal 2023-04-26 15:21:53 +05:30
parent 93a5107e79
commit 6a07435bb0
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 71 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

31
kittens/unicode_input/main.go
View file

@ -441,26 +441,27 @@ func (self *handler) handle_favorites_key_event(event *loop.KeyEvent) {
self.lp.Quit(1)
return
}
resume, err := self.lp.Suspend()
err = self.lp.SuspendAndRun(func() error {
cmd := exec.Command(exe, "edit-in-kitty", "--type=overlay", fp)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err == nil {
load_favorites(true)
} else {
fmt.Fprintln(os.Stderr, err)
fmt.Fprintln(os.Stderr, "Failed to run edit-in-kitty, favorites have not been changed. Press Enter to continue.")
var ln string
fmt.Scanln(&ln)
}
return nil
})
if err != nil {
self.err = err
self.lp.Quit(1)
return
}
defer resume()
cmd := exec.Command(exe, "edit-in-kitty", "--type=overlay", fp)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err == nil {
load_favorites(true)
} else {
fmt.Fprintln(os.Stderr, err)
fmt.Fprintln(os.Stderr, "Failed to run edit-in-kitty, favorites have not been changed. Press Enter to continue.")
var ln string
fmt.Scanln(&ln)
}
}
}